From c9214a0549042005267e97080de0cac812deb8ab Mon Sep 17 00:00:00 2001 From: Andrew Manison Date: Sun, 4 Apr 2010 16:51:44 -0400 Subject: Changes to package builds to fix missing/changed/broken source archives. --- main/cramfs/APKBUILD | 4 +- main/curl/APKBUILD | 6 +- main/dhcp/APKBUILD | 2 +- main/dialog/APKBUILD | 6 +- .../01-fix-install-options-for-busybox.patch | 65 ++++++++++++++++++++++ main/procps/APKBUILD | 13 ++++- 6 files changed, 84 insertions(+), 12 deletions(-) create mode 100644 main/procps/01-fix-install-options-for-busybox.patch (limited to 'main') diff --git a/main/cramfs/APKBUILD b/main/cramfs/APKBUILD index e40e57c2c..d552fec3c 100644 --- a/main/cramfs/APKBUILD +++ b/main/cramfs/APKBUILD @@ -1,12 +1,12 @@ # Maintainer: Natanael Copa pkgname=cramfs pkgver=1.1 -pkgrel=0 +pkgrel=1 pkgdesc="Linux filesystem designed to be simple, small, and to compress things well" arch="" url="http://sourceforge.net/projects/cramfs/" license='GPL' -depends="uclibc zlib" +depends="" makedepends="zlib-dev" source="http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz" diff --git a/main/curl/APKBUILD b/main/curl/APKBUILD index a7bcbd03b..fb4ed38d6 100644 --- a/main/curl/APKBUILD +++ b/main/curl/APKBUILD @@ -1,13 +1,13 @@ # Maintainer: Carlo Landmeter pkgname=curl -pkgver=7.19.7 +pkgver=7.20.0 pkgrel=0 pkgdesc="An URL retrival utility and library" url="http://curl.haxx.se" license="MIT" depends= makedepends="zlib-dev openssl-dev" -source="http://curl.osmirror.nl/download/curl-$pkgver.tar.bz2" +source="http://curl.haxx.se/download/curl-$pkgver.tar.bz2" subpackages="$pkgname-doc $pkgname-dev" @@ -25,4 +25,4 @@ package() { make DESTDIR="$pkgdir" install } -md5sums="79a8fbb2eed5464b97bdf94bee109380 curl-7.19.7.tar.bz2" +md5sums="3dda78c4a808d9a779dc3a2ae81b47d8 curl-7.20.0.tar.bz2" diff --git a/main/dhcp/APKBUILD b/main/dhcp/APKBUILD index 33f4e8531..ab15af69b 100644 --- a/main/dhcp/APKBUILD +++ b/main/dhcp/APKBUILD @@ -10,7 +10,7 @@ depends= makedepends= install="dhcp.pre-install dhcp.post-install dhcp.pre-upgrade dhcp.post-upgrade" subpackages="$pkgname-doc $pkgname-dev dhclient dhcrelay" -source="http://ftp.isc.org/isc/dhcp/$pkgname-$_realver.tar.gz +source="http://ftp.isc.org/isc/dhcp/dhcp-4.1-history/$pkgname-$_realver.tar.gz linux_ipv6_discover.patch dhcp-3.0-fix-perms.patch dhcrelay.initd diff --git a/main/dialog/APKBUILD b/main/dialog/APKBUILD index 99619e31c..a94e4f99d 100644 --- a/main/dialog/APKBUILD +++ b/main/dialog/APKBUILD @@ -1,13 +1,13 @@ # Contributor: Michael Mason # Maintainer: Natanael Copa pkgname=dialog -pkgver=1.1.20080819 +pkgver=1.1.20100119 _ver=${pkgver%.*}-${pkgver##*.} pkgrel=0 pkgdesc="A script-interpreter which provides a set of curses" url="http://invisible-island.net/dialog/dialog.html" license="GPL" -depends="uclibc ncurses" +depends="" makedepends="ncurses-dev" install= subpackages="$pkgname-doc" @@ -24,4 +24,4 @@ build() { make DESTDIR="$pkgdir" install } -md5sums="3caebd641a9f337b980becb4444336c5 dialog.tar.gz" +md5sums="3d62219658fdddf3c6247fb45831a5d0 dialog.tar.gz" diff --git a/main/procps/01-fix-install-options-for-busybox.patch b/main/procps/01-fix-install-options-for-busybox.patch new file mode 100644 index 000000000..792a78155 --- /dev/null +++ b/main/procps/01-fix-install-options-for-busybox.patch @@ -0,0 +1,65 @@ +--- orig/procps-3.2.8/Makefile ++++ src/procps-3.2.8/Makefile +@@ -27,7 +27,7 @@ + ldconfig := ldconfig + ln_f := ln -f + ln_sf := ln -sf +-install := install -D --owner 0 --group 0 ++install := install -D -o 0 -g 0 + + # Lame x86-64 /lib64 and /usr/lib64 abomination: + lib64 := lib$(shell [ -d /lib64 ] && echo 64) +@@ -222,10 +222,10 @@ + ###### install + + $(BINFILES) : all +- $(install) --mode a=rx $(notdir $@) $@ ++ $(install) -m a=rx $(notdir $@) $@ + + $(MANFILES) : all +- $(install) --mode a=r $(notdir $@) $@ ++ $(install) -m a=r $(notdir $@) $@ + + install: $(filter-out $(SKIP) $(addprefix $(DESTDIR),$(SKIP)),$(INSTALL)) + cd $(usr/bin) && $(ln_f) skill snice +--- orig/procps-3.2.8/proc/module.mk ++++ src/procps-3.2.8/proc/module.mk +@@ -96,7 +96,7 @@ + #################### install rules ########################### + + $(lib)$(SOFILE) : proc/$(SONAME) +- $(install) --mode a=rx $< $@ ++ $(install) -m a=rx $< $@ + + ifneq ($(SOLINK),$(SOFILE)) + .PHONY: $(lib)$(SOLINK) +@@ -115,14 +115,14 @@ + $(ldconfig) + + $(usr/lib)$(ANAME) : proc/$(ANAME) +- $(install) --mode a=r $< $@ ++ $(install) -m a=r $< $@ + + # Junk anyway... supposed to go in /usr/include/$(NAME) + #INSTALL += $(addprefix $(include),$(HDRFILES)) + # + #$(addprefix $(include),$(HDRFILES)): $(include)% : proc/% + #$(include)% : proc/% +-# $(install) --mode a=r $< $@ ++# $(install) -m a=r $< $@ + + ################################################################## + +--- orig/procps-3.2.8/ps/module.mk ++++ src/procps-3.2.8/ps/module.mk +@@ -33,8 +33,8 @@ + + + $(bin)ps: ps/ps +- $(install) --mode a=rx $< $@ ++ $(install) -m a=rx $< $@ + + $(man1)ps.1 : ps/ps.1 +- $(install) --mode a=r $< $@ ++ $(install) -m a=r $< $@ + -rm -f $(DESTDIR)/var/catman/cat1/ps.1.gz $(DESTDIR)/var/man/cat1/ps.1.gz diff --git a/main/procps/APKBUILD b/main/procps/APKBUILD index 83204ad1b..f0f169779 100644 --- a/main/procps/APKBUILD +++ b/main/procps/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa pkgname=procps pkgver=3.2.8 -pkgrel=0 +pkgrel=1 pkgdesc="Utilities for monitoring your system and processes on your system" url="http://procps.sourceforge.net/" license="GPL LGPL" @@ -9,7 +9,13 @@ depends= # needs fancy install makedepends="ncurses-dev coreutils" subpackages="$pkgname-dev $pkgname-doc libproc" -source="http://$pkgname.sourceforge.net/$pkgname-$pkgver.tar.gz" +source="http://$pkgname.sourceforge.net/$pkgname-$pkgver.tar.gz + 01-fix-install-options-for-busybox.patch" + +prepare() { + cd "$srcdir" + patch -p1 -i "$srcdir"/01-fix-install-options-for-busybox.patch || return 1 +} build() { cd "$srcdir"/$pkgname-$pkgver @@ -30,4 +36,5 @@ libproc() { ln -s libproc-$pkgver.so "$subpkgdir"/lib/libproc.so } -md5sums="9532714b6846013ca9898984ba4cd7e0 procps-3.2.8.tar.gz" +md5sums="9532714b6846013ca9898984ba4cd7e0 procps-3.2.8.tar.gz +2b821e841acd08620789d5ffd19d58e9 01-fix-install-options-for-busybox.patch" -- cgit v1.2.3 From 97a19460d006618b87187827f8d8a4aa6ecf0468 Mon Sep 17 00:00:00 2001 From: Andrew Manison Date: Mon, 5 Apr 2010 16:31:17 +0000 Subject: Updates to package build files to specify updated or relocated sources --- main/atop/APKBUILD | 2 +- main/chrony/APKBUILD | 4 ++-- main/heimdal/APKBUILD | 2 +- main/libconfig/APKBUILD | 4 ++-- main/libxfce4menu/APKBUILD | 2 +- main/lua-uuid/APKBUILD | 2 +- main/man-pages/APKBUILD | 6 +++--- main/pax-utils/APKBUILD | 2 +- main/snort/APKBUILD | 4 ++-- main/syslinux/APKBUILD | 2 +- main/uiconv/APKBUILD | 2 +- 11 files changed, 16 insertions(+), 16 deletions(-) (limited to 'main') diff --git a/main/atop/APKBUILD b/main/atop/APKBUILD index ecbfb102b..1b70c4075 100644 --- a/main/atop/APKBUILD +++ b/main/atop/APKBUILD @@ -8,7 +8,7 @@ license="GPL-2" depends= makedepends="zlib-dev ncurses-dev" subpackages="$pkgname-doc" -source="http://www.atoptool.nl/packages/atop-$pkgver.tar.gz +source="http://www.atoptool.nl/download/atop-$pkgver.tar.gz atop-bb-compat.patch atop.initd" diff --git a/main/chrony/APKBUILD b/main/chrony/APKBUILD index 54d94e51d..a995bf10d 100644 --- a/main/chrony/APKBUILD +++ b/main/chrony/APKBUILD @@ -3,12 +3,12 @@ pkgname=chrony pkgver=1.23 pkgrel=5 pkgdesc="NTP client and server programs" -url="http://chrony.sunsite.dk/" +url="http://chrony.tuxfamily.org/" license="GPL-2" depends="logrotate" makedepends="texinfo" subpackages="$pkgname-doc" -source="http://www.sfr-fresh.com/linux/misc/chrony-$pkgver.tar.gz +source="http://download.tuxfamily.org/chrony/$pkgname-$pkgver.tar.gz $pkgname-1.20-conf.c-gentoo.diff $pkgname-1.20-chrony.conf.example-gentoo.diff $pkgname-1.21-makefile.diff diff --git a/main/heimdal/APKBUILD b/main/heimdal/APKBUILD index e98d9cf01..49c35ea89 100644 --- a/main/heimdal/APKBUILD +++ b/main/heimdal/APKBUILD @@ -12,7 +12,7 @@ makedepends="gawk readline-dev e2fsprogs-dev>=1.41.9-r2 sqlite-dev autoconf auto install= subpackages="$pkgname-doc $pkgname-dev $pkgname-ftp $pkgname-telnet \ $pkgname-su $pkgname-rsh $pkgname-rcp $pkgname-pagsh $pkgname-kf" -source="http://www.h5l.org/dist/src/$pkgname-$pkgver.tar.gz +source="http://ftp4.de.freesbie.org/pub/misc/heimdal/src/$pkgname-$pkgver.tar.gz 001_all_heimdal-no_libedit.patch 002_all_heimdal-fPIC.patch 003_all_heimdal-rxapps.patch diff --git a/main/libconfig/APKBUILD b/main/libconfig/APKBUILD index cd2d6e001..e4bf50072 100644 --- a/main/libconfig/APKBUILD +++ b/main/libconfig/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Natanael Copa pkgname=libconfig -pkgver=1.4.1 +pkgver=1.4.3 pkgrel=0 pkgdesc="a simple library for manipulating structured configuration files" url="http://www.hyperrealm.com/libconfig/" @@ -24,4 +24,4 @@ package() { make -j1 DESTDIR="$pkgdir/" install } -md5sums="7b2885272802b3ace56d3c8b445a4588 libconfig-1.4.1.tar.gz" +md5sums="295f580a7bc3a03a44d520d6ace55ee6 libconfig-1.4.3.tar.gz" diff --git a/main/libxfce4menu/APKBUILD b/main/libxfce4menu/APKBUILD index 0023f2d93..4620483f7 100644 --- a/main/libxfce4menu/APKBUILD +++ b/main/libxfce4menu/APKBUILD @@ -9,7 +9,7 @@ depends= subpackages="$pkgname-dev $pkgname-doc" makedepends="libxfce4util-dev intltool pkgconfig gtk+-dev gettext-dev libiconv-dev" -source="http://mocha.xfce.org/archive/xfce-$pkgver/src/$pkgname-$pkgver.tar.bz2" +source="http://i386.miwibox.org/distfiles/xfce4/$pkgname-$pkgver.tar.bz2" build () { diff --git a/main/lua-uuid/APKBUILD b/main/lua-uuid/APKBUILD index 0f8f899be..0141699df 100644 --- a/main/lua-uuid/APKBUILD +++ b/main/lua-uuid/APKBUILD @@ -28,4 +28,4 @@ package() { install -Dm755 uuid.so "$pkgdir"/usr/lib/lua/5.1/uuid.so } -md5sums="75f2e8c808c0fb375d9ec5255fd5d4de luuid.tar.gz" +md5sums="e5bd7c2cf563ac4192b793934f545f49 luuid.tar.gz" diff --git a/main/man-pages/APKBUILD b/main/man-pages/APKBUILD index a827b0a79..78336bd56 100644 --- a/main/man-pages/APKBUILD +++ b/main/man-pages/APKBUILD @@ -1,8 +1,8 @@ # Maintainer: Natanael Copa pkgname=man-pages -pkgver=3.23 +pkgver=3.24 _posixver=2003-a -pkgrel=1 +pkgrel=0 pkgdesc="Linux man pages" url="http://www.kernel.org/doc/man-pages/" license="GPL" @@ -27,5 +27,5 @@ build () rm "$pkgdir"/usr/share/man/man3/iconv* } -md5sums="4d0263bded9ad02a123ce11114ef76ac man-pages-3.23.tar.gz +md5sums="083fc666f1f1143157901e96c9810539 man-pages-3.24.tar.gz 7c78aff03c0a6767ba483d34f19e4b09 man-pages-posix-2003-a.tar.bz2" diff --git a/main/pax-utils/APKBUILD b/main/pax-utils/APKBUILD index 8b31035f5..d950bd3e8 100644 --- a/main/pax-utils/APKBUILD +++ b/main/pax-utils/APKBUILD @@ -17,4 +17,4 @@ build() { make DESTDIR="$pkgdir/" install } -md5sums="15a6f2ddadedac0ab6cd4b0683b767b9 pax-utils-0.2.tar.bz2" +md5sums="a2097463fd5a34dd707b2d72d84aea89 pax-utils-0.2.tar.bz2" diff --git a/main/snort/APKBUILD b/main/snort/APKBUILD index 15ac9717a..11010a3ad 100644 --- a/main/snort/APKBUILD +++ b/main/snort/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Michael Mason # Maintainer: Natanael Copa pkgname=snort -pkgver=2.8.5.1 +pkgver=2.8.5.3 pkgrel=0 pkgdesc="An open source network intrusion prevention and detection system" url="http://www.snort.org/" @@ -40,6 +40,6 @@ package() { install -D -m 644 ../snort.confd "$pkgdir"/etc/conf.d/snort } -md5sums="b1abf3a9fa3486720c9a2b5eff920417 snort-2.8.5.1.tar.gz +md5sums="ef02aaad54746603f2cb3236fe962128 snort-2.8.5.3.tar.gz ffda56f7c20f5cea1c37c971e0f1d6c9 snort.initd 446f8d2b3435b8a6be738da978670605 snort.confd" diff --git a/main/syslinux/APKBUILD b/main/syslinux/APKBUILD index e543f31f6..0320b84a4 100644 --- a/main/syslinux/APKBUILD +++ b/main/syslinux/APKBUILD @@ -7,7 +7,7 @@ url="http://syslinux.org" license="GPL" makedepends="nasm perl" depends="mtools" -source="http://www.kernel.org/pub/linux/utils/boot/$pkgname/$pkgname-$pkgver.tar.bz2 +source="http://www.kernel.org/pub/linux/utils/boot/$pkgname/3.xx/$pkgname-$pkgver.tar.bz2 $pkgname-3.72-nopie.patch " subpackages="$pkgname-doc" diff --git a/main/uiconv/APKBUILD b/main/uiconv/APKBUILD index 3814bb565..a05aaa19d 100644 --- a/main/uiconv/APKBUILD +++ b/main/uiconv/APKBUILD @@ -14,4 +14,4 @@ build() { make DESTDIR="$pkgdir" PREFIX=/usr/uiconv install } -md5sums="5cd7f80085324d08cb976fec674cd98d uiconv-0.3.tar.bz2" +md5sums="de2ce8da53f32bdec578e1f0270fa15d uiconv-0.3.tar.bz2" -- cgit v1.2.3 From 06dd0dc115d6d0370791eeea58e0bb5da3d0f7ae Mon Sep 17 00:00:00 2001 From: Andrew Manison Date: Thu, 29 Apr 2010 20:07:25 +0000 Subject: Patched abuild to use source mirror, and added options to enable/disable color. --- .../abuild/0002-add-fetch-from-source-mirror.patch | 103 +++++++++++++++++++++ ...003-add-color-control-command-line-option.patch | 50 ++++++++++ main/abuild/APKBUILD | 21 ++++- 3 files changed, 171 insertions(+), 3 deletions(-) create mode 100644 main/abuild/0002-add-fetch-from-source-mirror.patch create mode 100644 main/abuild/0003-add-color-control-command-line-option.patch (limited to 'main') diff --git a/main/abuild/0002-add-fetch-from-source-mirror.patch b/main/abuild/0002-add-fetch-from-source-mirror.patch new file mode 100644 index 000000000..926dbcc9a --- /dev/null +++ b/main/abuild/0002-add-fetch-from-source-mirror.patch @@ -0,0 +1,103 @@ +diff -rupN orig/abuild-2.1/abuild.in src/abuild-2.1/abuild.in +--- orig/abuild-2.1/abuild.in 2009-12-30 04:05:49.000000000 -0500 ++++ src/abuild-2.1/abuild.in 2010-04-29 09:21:43.000000000 -0400 +@@ -149,12 +149,11 @@ md5check() { + + uri_fetch() { + local uri="$1" +- local d="${s##*/}" # $(basename $s) ++ local d="${uri##*/}" # $(basename $uri) + local opts + [ -n "$quiet" ] && opts="-q" + [ -f "$SRCDEST/$d" ] && return 0 + +- + # we need GNU wget for this + case "$uri" in + https://*) opts="--no-check-certificate";; +@@ -178,12 +177,22 @@ is_remote() { + return 1 + } + ++# try download from file from mirror first ++uri_fetch_mirror() { ++ local uri="$1" ++ local d="${uri##*/}" # $(basename $uri) ++ if [ -n "$DISTFILES_MIRROR" ]; then ++ uri_fetch "$DISTFILES_MIRROR"/$d && return 0 ++ fi ++ uri_fetch "$uri" ++} ++ + default_fetch() { + local s + mkdir -p "$srcdir" + for s in $source; do + if is_remote "$s"; then +- uri_fetch "$s" || return 1 ++ uri_fetch_mirror "$s" || return 1 + ln -sf "$SRCDEST/${s##*/}" "$srcdir"/ + else + ln -sf "$startdir/$s" "$srcdir/" +@@ -308,6 +317,12 @@ build() { + : + } + ++# generate a simple tar.gz package of pkgdir ++targz() { ++ cd "$pkgdir" || return 1 ++ tar -czf "$PKGDEST"/$pkgname-$pkgver-r$pkgrel.tar.gz * ++} ++ + get_split_func() { + # get the 'func' from "sub-pkg:func" + local func=${1##*:} +@@ -712,8 +727,8 @@ up2date() { + depparse_aports() { + # lets run this in a subshell since we source all APKBUILD here + ( +- aportsdir=$(realpath ${APKBUILD%/APKBUILD}/../..) +- for i in $aportsdir/*/*/APKBUILD; do ++ aportsdir=$(realpath ${APKBUILD%/APKBUILD}/..) ++ for i in $aportsdir/*/APKBUILD; do + pkgname= + subpackages= + depends= +@@ -811,7 +826,13 @@ builddeps() { + + uninstall_after=".makedepends-$pkgname $uninstall_after" + if [ -n "$install_deps" ] && [ -z "$recursive" ]; then ++ # make a --simluate run first to detect missing deps ++ # apk-tools --virtual is no goot at reporting those. ++ $SUDO apk add --repository "$apkcache" \ ++ --wait 30 \ ++ --simulate --quiet $deps || return 1 + $SUDO apk add --repository "$apkcache" \ ++ --wait 30 \ + --virtual .makedepends-$pkgname $deps \ + && return 0 + fi +@@ -834,6 +855,7 @@ builddeps() { + cd "$dir" && $0 -k -r apkcache || return 1 + done + $SUDO apk add -u --repository "$apkcache" \ ++ --wait 30 \ + --virtual .makedepends-$pkgname $deps + } + +@@ -945,12 +967,13 @@ post_add() { + post_add $i || return 1 + fi + done +- $SUDO apk add -u "$pkgf" || die "Failed to install $1" ++ $SUDO apk add --wait 30 -u "$pkgf" || die "Failed to install $1" + } + + installdeps() { + local deps i +- sudo apk add --repository "$apkcache" --virtual .makedepends-$pkgname \ ++ sudo apk add --wait 30 --repository "$apkcache" \ ++ --virtual .makedepends-$pkgname \ + $makedepends + } + diff --git a/main/abuild/0003-add-color-control-command-line-option.patch b/main/abuild/0003-add-color-control-command-line-option.patch new file mode 100644 index 000000000..434f634b9 --- /dev/null +++ b/main/abuild/0003-add-color-control-command-line-option.patch @@ -0,0 +1,50 @@ +diff -rupN orig/abuild-2.1/abuild.in src/abuild-2.1/abuild.in +--- orig/abuild-2.1/abuild.in 2010-04-29 12:34:59.000000000 -0400 ++++ src/abuild-2.1/abuild.in 2010-04-29 12:35:56.000000000 -0400 +@@ -25,15 +25,27 @@ FAKEROOT=${FAKEROOT:-"fakeroot"} + ABUILD_CONF=${ABUILD_CONF:-"$sysconfdir/abuild.conf"} + [ -f "$ABUILD_CONF" ] && . "$ABUILD_CONF" + +- +-#colors +-if [ -n "$USE_COLORS" ]; then ++default_colors() { + NORMAL="\033[1;0m" + STRONG="\033[1;1m" + RED="\033[1;31m" + GREEN="\033[1;32m" + YELLOW="\033[1;33m" + BLUE="\033[1;34m" ++} ++ ++monochrome() { ++ NORMAL="" ++ STRONG="" ++ RED="" ++ GREEN="" ++ YELLOW="" ++ BLUE="" ++} ++ ++#colors ++if [ -n "$USE_COLORS" ]; then ++ default_colors + fi + + +@@ -1036,12 +1048,14 @@ unset force + unset recursive +-while getopts "dfFhi:kinp:P:qrRs:u" opt; do ++while getopts "cdfFhi:kimnp:P:qrRs:u" opt; do + case $opt in ++ 'c') default_colors;; + 'd') nodeps=1;; + 'f') force=1;; + 'F') forceroot=1;; + 'h') usage;; + 'i') install_after="$install_after $OPTARG";; + 'k') keep=1;; ++ 'm') monochrome;; + 'n') die "Use newapkbuild to create new aports";; + 'p') PKGDEST=$OPTARG;; + 'P') REPODEST=$OPTARG;; diff --git a/main/abuild/APKBUILD b/main/abuild/APKBUILD index ed4d017cf..4f3bc4f61 100644 --- a/main/abuild/APKBUILD +++ b/main/abuild/APKBUILD @@ -2,14 +2,27 @@ pkgdesc="Script to build Alpine Packages" pkgname=abuild pkgver=2.1 -pkgrel=0 +pkgrel=1 url=http://git.alpinelinux.org/cgit/abuild/ source="http://git.alpinelinux.org/cgit/abuild/snapshot/abuild-$pkgver.tar.bz2 - " + 0002-add-fetch-from-source-mirror.patch + 0003-add-color-control-command-line-option.patch" depends="fakeroot file sudo pax-utils openssl apk-tools" makedepends="openssl-dev pkgconfig" license=GPL-2 +prepare() { + cd "$srcdir"/$pkgname-$_realver + # patches + for i in ../0002-add-fetch-from-source-mirror.patch ../0003-add-color-control-command-line-option.patch; do + msg "Applying $i" + if ! patch --verbose -p1 -i $i; then + error "$i failed" + return 1 + fi + done +} + build() { cd "$srcdir/$pkgname-$pkgver" @@ -18,4 +31,6 @@ build() { install -m 644 abuild.conf "$pkgdir"/etc/abuild.conf } -md5sums="2268fa6147c8088139ef136184cd2ae0 abuild-2.1.tar.bz2" +md5sums="2268fa6147c8088139ef136184cd2ae0 abuild-2.1.tar.bz2 +29b83cfe5c4b8e8491c6f2f073da4314 0002-add-fetch-from-source-mirror.patch +d710ffb3c7f3eae52cac62bc2bf4f454 0003-add-color-control-command-line-option.patch" -- cgit v1.2.3 From ccf26410d30adc8c1934dd553687157ed6e31d69 Mon Sep 17 00:00:00 2001 From: Andrew Manison Date: Wed, 5 May 2010 21:29:13 +0000 Subject: Added support for distfiles in local directory, to support build bot. --- main/abuild/0002-add-fetch-from-source-mirror.patch | 8 ++++++-- main/abuild/APKBUILD | 6 +++--- 2 files changed, 9 insertions(+), 5 deletions(-) (limited to 'main') diff --git a/main/abuild/0002-add-fetch-from-source-mirror.patch b/main/abuild/0002-add-fetch-from-source-mirror.patch index 926dbcc9a..5cd964852 100644 --- a/main/abuild/0002-add-fetch-from-source-mirror.patch +++ b/main/abuild/0002-add-fetch-from-source-mirror.patch @@ -15,7 +15,7 @@ diff -rupN orig/abuild-2.1/abuild.in src/abuild-2.1/abuild.in # we need GNU wget for this case "$uri" in https://*) opts="--no-check-certificate";; -@@ -178,12 +177,22 @@ is_remote() { +@@ -178,12 +177,26 @@ is_remote() { return 1 } @@ -24,7 +24,11 @@ diff -rupN orig/abuild-2.1/abuild.in src/abuild-2.1/abuild.in + local uri="$1" + local d="${uri##*/}" # $(basename $uri) + if [ -n "$DISTFILES_MIRROR" ]; then -+ uri_fetch "$DISTFILES_MIRROR"/$d && return 0 ++ if [ -f "$DISTFILES_MIRROR"/$d ] ; then ++ cp "$DISTFILES_MIRROR"/$d . ++ else ++ uri_fetch "$DISTFILES_MIRROR"/$d && return 0 ++ fi + fi + uri_fetch "$uri" +} diff --git a/main/abuild/APKBUILD b/main/abuild/APKBUILD index 4f3bc4f61..876a6e01a 100644 --- a/main/abuild/APKBUILD +++ b/main/abuild/APKBUILD @@ -2,12 +2,12 @@ pkgdesc="Script to build Alpine Packages" pkgname=abuild pkgver=2.1 -pkgrel=1 +pkgrel=2 url=http://git.alpinelinux.org/cgit/abuild/ source="http://git.alpinelinux.org/cgit/abuild/snapshot/abuild-$pkgver.tar.bz2 0002-add-fetch-from-source-mirror.patch 0003-add-color-control-command-line-option.patch" -depends="fakeroot file sudo pax-utils openssl apk-tools" +depends="fakeroot file sudo pax-utils apk-tools" makedepends="openssl-dev pkgconfig" license=GPL-2 @@ -32,5 +32,5 @@ build() { } md5sums="2268fa6147c8088139ef136184cd2ae0 abuild-2.1.tar.bz2 -29b83cfe5c4b8e8491c6f2f073da4314 0002-add-fetch-from-source-mirror.patch +5c0332196a6693d49cfe3d75c29fc63c 0002-add-fetch-from-source-mirror.patch d710ffb3c7f3eae52cac62bc2bf4f454 0003-add-color-control-command-line-option.patch" -- cgit v1.2.3 From 2c7f7f25f1476495e77fbf4528199e794aaff614 Mon Sep 17 00:00:00 2001 From: Andrew Manison Date: Tue, 1 Jun 2010 23:41:03 +0000 Subject: Removed patch files rolled into 2.3. --- main/abuild/0001-Revert-abuild-minor-cleanup.patch | 31 ------ .../abuild/0002-add-fetch-from-source-mirror.patch | 107 --------------------- ...003-add-color-control-command-line-option.patch | 50 ---------- 3 files changed, 188 deletions(-) delete mode 100644 main/abuild/0001-Revert-abuild-minor-cleanup.patch delete mode 100644 main/abuild/0002-add-fetch-from-source-mirror.patch delete mode 100644 main/abuild/0003-add-color-control-command-line-option.patch (limited to 'main') diff --git a/main/abuild/0001-Revert-abuild-minor-cleanup.patch b/main/abuild/0001-Revert-abuild-minor-cleanup.patch deleted file mode 100644 index 25569b5b6..000000000 --- a/main/abuild/0001-Revert-abuild-minor-cleanup.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 19b2598f8a52ba8af07eb4904788d0843130b094 Mon Sep 17 00:00:00 2001 -From: Natanael Copa -Date: Tue, 27 Oct 2009 15:24:18 +0000 -Subject: [PATCH] Revert "abuild: minor cleanup" - -This commit seems to kill the entire repository - -This reverts commit 46aed95754ebeb17a3a367b3b41d0b6424fd18d9. ---- - buildrepo.in | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/buildrepo.in b/buildrepo.in -index d719c34..c211789 100755 ---- a/buildrepo.in -+++ b/buildrepo.in -@@ -22,9 +22,9 @@ usage() { - - - listpackages() { -+ cd "$aportsdir/$1" - for i in */APKBUILD; do -- cd "$aportsdir"/$1/${i%/*} -- abuild listpkg -+ APKBUILD=$i abuild listpkg - done - } - --- -1.6.5 - diff --git a/main/abuild/0002-add-fetch-from-source-mirror.patch b/main/abuild/0002-add-fetch-from-source-mirror.patch deleted file mode 100644 index 5cd964852..000000000 --- a/main/abuild/0002-add-fetch-from-source-mirror.patch +++ /dev/null @@ -1,107 +0,0 @@ -diff -rupN orig/abuild-2.1/abuild.in src/abuild-2.1/abuild.in ---- orig/abuild-2.1/abuild.in 2009-12-30 04:05:49.000000000 -0500 -+++ src/abuild-2.1/abuild.in 2010-04-29 09:21:43.000000000 -0400 -@@ -149,12 +149,11 @@ md5check() { - - uri_fetch() { - local uri="$1" -- local d="${s##*/}" # $(basename $s) -+ local d="${uri##*/}" # $(basename $uri) - local opts - [ -n "$quiet" ] && opts="-q" - [ -f "$SRCDEST/$d" ] && return 0 - -- - # we need GNU wget for this - case "$uri" in - https://*) opts="--no-check-certificate";; -@@ -178,12 +177,26 @@ is_remote() { - return 1 - } - -+# try download from file from mirror first -+uri_fetch_mirror() { -+ local uri="$1" -+ local d="${uri##*/}" # $(basename $uri) -+ if [ -n "$DISTFILES_MIRROR" ]; then -+ if [ -f "$DISTFILES_MIRROR"/$d ] ; then -+ cp "$DISTFILES_MIRROR"/$d . -+ else -+ uri_fetch "$DISTFILES_MIRROR"/$d && return 0 -+ fi -+ fi -+ uri_fetch "$uri" -+} -+ - default_fetch() { - local s - mkdir -p "$srcdir" - for s in $source; do - if is_remote "$s"; then -- uri_fetch "$s" || return 1 -+ uri_fetch_mirror "$s" || return 1 - ln -sf "$SRCDEST/${s##*/}" "$srcdir"/ - else - ln -sf "$startdir/$s" "$srcdir/" -@@ -308,6 +317,12 @@ build() { - : - } - -+# generate a simple tar.gz package of pkgdir -+targz() { -+ cd "$pkgdir" || return 1 -+ tar -czf "$PKGDEST"/$pkgname-$pkgver-r$pkgrel.tar.gz * -+} -+ - get_split_func() { - # get the 'func' from "sub-pkg:func" - local func=${1##*:} -@@ -712,8 +727,8 @@ up2date() { - depparse_aports() { - # lets run this in a subshell since we source all APKBUILD here - ( -- aportsdir=$(realpath ${APKBUILD%/APKBUILD}/../..) -- for i in $aportsdir/*/*/APKBUILD; do -+ aportsdir=$(realpath ${APKBUILD%/APKBUILD}/..) -+ for i in $aportsdir/*/APKBUILD; do - pkgname= - subpackages= - depends= -@@ -811,7 +826,13 @@ builddeps() { - - uninstall_after=".makedepends-$pkgname $uninstall_after" - if [ -n "$install_deps" ] && [ -z "$recursive" ]; then -+ # make a --simluate run first to detect missing deps -+ # apk-tools --virtual is no goot at reporting those. -+ $SUDO apk add --repository "$apkcache" \ -+ --wait 30 \ -+ --simulate --quiet $deps || return 1 - $SUDO apk add --repository "$apkcache" \ -+ --wait 30 \ - --virtual .makedepends-$pkgname $deps \ - && return 0 - fi -@@ -834,6 +855,7 @@ builddeps() { - cd "$dir" && $0 -k -r apkcache || return 1 - done - $SUDO apk add -u --repository "$apkcache" \ -+ --wait 30 \ - --virtual .makedepends-$pkgname $deps - } - -@@ -945,12 +967,13 @@ post_add() { - post_add $i || return 1 - fi - done -- $SUDO apk add -u "$pkgf" || die "Failed to install $1" -+ $SUDO apk add --wait 30 -u "$pkgf" || die "Failed to install $1" - } - - installdeps() { - local deps i -- sudo apk add --repository "$apkcache" --virtual .makedepends-$pkgname \ -+ sudo apk add --wait 30 --repository "$apkcache" \ -+ --virtual .makedepends-$pkgname \ - $makedepends - } - diff --git a/main/abuild/0003-add-color-control-command-line-option.patch b/main/abuild/0003-add-color-control-command-line-option.patch deleted file mode 100644 index 434f634b9..000000000 --- a/main/abuild/0003-add-color-control-command-line-option.patch +++ /dev/null @@ -1,50 +0,0 @@ -diff -rupN orig/abuild-2.1/abuild.in src/abuild-2.1/abuild.in ---- orig/abuild-2.1/abuild.in 2010-04-29 12:34:59.000000000 -0400 -+++ src/abuild-2.1/abuild.in 2010-04-29 12:35:56.000000000 -0400 -@@ -25,15 +25,27 @@ FAKEROOT=${FAKEROOT:-"fakeroot"} - ABUILD_CONF=${ABUILD_CONF:-"$sysconfdir/abuild.conf"} - [ -f "$ABUILD_CONF" ] && . "$ABUILD_CONF" - -- --#colors --if [ -n "$USE_COLORS" ]; then -+default_colors() { - NORMAL="\033[1;0m" - STRONG="\033[1;1m" - RED="\033[1;31m" - GREEN="\033[1;32m" - YELLOW="\033[1;33m" - BLUE="\033[1;34m" -+} -+ -+monochrome() { -+ NORMAL="" -+ STRONG="" -+ RED="" -+ GREEN="" -+ YELLOW="" -+ BLUE="" -+} -+ -+#colors -+if [ -n "$USE_COLORS" ]; then -+ default_colors - fi - - -@@ -1036,12 +1048,14 @@ unset force - unset recursive --while getopts "dfFhi:kinp:P:qrRs:u" opt; do -+while getopts "cdfFhi:kimnp:P:qrRs:u" opt; do - case $opt in -+ 'c') default_colors;; - 'd') nodeps=1;; - 'f') force=1;; - 'F') forceroot=1;; - 'h') usage;; - 'i') install_after="$install_after $OPTARG";; - 'k') keep=1;; -+ 'm') monochrome;; - 'n') die "Use newapkbuild to create new aports";; - 'p') PKGDEST=$OPTARG;; - 'P') REPODEST=$OPTARG;; -- cgit v1.2.3 From 8e157a2055bf4e5f3ec2113b32080f3fcf2f7f34 Mon Sep 17 00:00:00 2001 From: Andrew Manison Date: Tue, 1 Jun 2010 23:45:07 +0000 Subject: Deleted old patch file. --- main/openssl/openssl-0.9.8k-padlock-sha.patch | 821 -------------------------- 1 file changed, 821 deletions(-) delete mode 100644 main/openssl/openssl-0.9.8k-padlock-sha.patch (limited to 'main') diff --git a/main/openssl/openssl-0.9.8k-padlock-sha.patch b/main/openssl/openssl-0.9.8k-padlock-sha.patch deleted file mode 100644 index b2e7e954d..000000000 --- a/main/openssl/openssl-0.9.8k-padlock-sha.patch +++ /dev/null @@ -1,821 +0,0 @@ -# -# OpenSSL patch to support VIA C7 hash engine -# Written by: Timo Teras -# based on patch by: Michal Ludvig -# http://www.logix.cz/michal/devel/padlock -# -Index: openssl-0.9.8k/crypto/engine/eng_padlock.c -=================================================================== ---- openssl-0.9.8k.orig/crypto/engine/eng_padlock.c 2009-07-27 16:18:20.000000000 +0300 -+++ openssl-0.9.8k/crypto/engine/eng_padlock.c 2009-07-30 22:02:54.000000000 +0300 -@@ -1,10 +1,13 @@ --/* -+/* - * Support for VIA PadLock Advanced Cryptography Engine (ACE) - * Written by Michal Ludvig - * http://www.logix.cz/michal - * -- * Big thanks to Andy Polyakov for a help with optimization, -- * assembler fixes, port to MS Windows and a lot of other -+ * SHA support by Timo Teras based on code -+ * originally by Michal Ludvig. -+ * -+ * Big thanks to Andy Polyakov for a help with optimization, -+ * assembler fixes, port to MS Windows and a lot of other - * valuable work on this engine! - */ - -@@ -66,6 +69,13 @@ - #include - #include - -+#include -+#include -+#include -+#include -+#include -+#include -+ - #include - #include - #include -@@ -74,12 +84,23 @@ - #ifndef OPENSSL_NO_AES - #include - #endif -+#ifndef OPENSSL_NO_SHA -+#include -+#endif - #include - #include - - #ifndef OPENSSL_NO_HW - #ifndef OPENSSL_NO_HW_PADLOCK - -+/* PadLock RNG is disabled by default */ -+#define PADLOCK_NO_RNG 1 -+ -+/* No ASM routines for SHA in MSC yet */ -+#ifdef _MSC_VER -+#define OPENSSL_NO_SHA -+#endif -+ - /* Attempt to have a single source for both 0.9.7 and 0.9.8 :-) */ - #if (OPENSSL_VERSION_NUMBER >= 0x00908000L) - # ifndef OPENSSL_NO_DYNAMIC_ENGINE -@@ -96,7 +117,7 @@ - /* VIA PadLock AES is available *ONLY* on some x86 CPUs. - Not only that it doesn't exist elsewhere, but it - even can't be compiled on other platforms! -- -+ - In addition, because of the heavy use of inline assembler, - compiler choice is limited to GCC and Microsoft C. */ - #undef COMPILE_HW_PADLOCK -@@ -138,20 +159,42 @@ - static int padlock_init(ENGINE *e); - - /* RNG Stuff */ -+#ifndef PADLOCK_NO_RNG - static RAND_METHOD padlock_rand; -+#endif - - /* Cipher Stuff */ - #ifndef OPENSSL_NO_AES - static int padlock_ciphers(ENGINE *e, const EVP_CIPHER **cipher, const int **nids, int nid); - #endif - -+/* Digest Stuff */ -+#ifndef OPENSSL_NO_SHA -+static int padlock_digests(ENGINE *e, const EVP_MD **digest, const int **nids, int nid); -+static volatile void *padlock_cached_sha_buffer = NULL; -+#endif -+ - /* Engine names */ - static const char *padlock_id = "padlock"; - static char padlock_name[100]; - - /* Available features */ --static int padlock_use_ace = 0; /* Advanced Cryptography Engine */ --static int padlock_use_rng = 0; /* Random Number Generator */ -+enum padlock_flags { -+ PADLOCK_RNG = 0x01, -+ PADLOCK_ACE = 0x02, -+ PADLOCK_ACE2 = 0x04, -+ PADLOCK_PHE = 0x08, -+ PADLOCK_PMM = 0x10 -+}; -+enum padlock_flags padlock_flags; -+ -+#define PADLOCK_HAVE_RNG (padlock_flags & PADLOCK_RNG) -+#define PADLOCK_HAVE_ACE (padlock_flags & (PADLOCK_ACE|PADLOCK_ACE2)) -+#define PADLOCK_HAVE_ACE1 (padlock_flags & PADLOCK_ACE) -+#define PADLOCK_HAVE_ACE2 (padlock_flags & PADLOCK_ACE2) -+#define PADLOCK_HAVE_PHE (padlock_flags & PADLOCK_PHE) -+#define PADLOCK_HAVE_PMM (padlock_flags & PADLOCK_PMM) -+ - #ifndef OPENSSL_NO_AES - static int padlock_aes_align_required = 1; - #endif -@@ -165,25 +208,30 @@ - /* Check available features */ - padlock_available(); - --#if 1 /* disable RNG for now, see commentary in vicinity of RNG code */ -- padlock_use_rng=0; --#endif -- - /* Generate a nice engine name with available features */ - BIO_snprintf(padlock_name, sizeof(padlock_name), -- "VIA PadLock (%s, %s)", -- padlock_use_rng ? "RNG" : "no-RNG", -- padlock_use_ace ? "ACE" : "no-ACE"); -+ "VIA PadLock: %s%s%s%s%s", -+ padlock_flags ? "" : "not supported", -+ PADLOCK_HAVE_RNG ? "RNG " : "", -+ PADLOCK_HAVE_ACE ? (PADLOCK_HAVE_ACE2 ? "ACE2 " : "ACE ") : "", -+ PADLOCK_HAVE_PHE ? "PHE " : "", -+ PADLOCK_HAVE_PMM ? "PMM " : ""); - -- /* Register everything or return with an error */ -+ /* Register everything or return with an error */ - if (!ENGINE_set_id(e, padlock_id) || - !ENGINE_set_name(e, padlock_name) || - -- !ENGINE_set_init_function(e, padlock_init) || -+ !ENGINE_set_init_function(e, padlock_init) - #ifndef OPENSSL_NO_AES -- (padlock_use_ace && !ENGINE_set_ciphers (e, padlock_ciphers)) || -+ || (PADLOCK_HAVE_ACE && !ENGINE_set_ciphers (e, padlock_ciphers)) - #endif -- (padlock_use_rng && !ENGINE_set_RAND (e, &padlock_rand))) { -+#ifndef OPENSSL_NO_SHA -+ || (PADLOCK_HAVE_PHE && !ENGINE_set_digests (e, padlock_digests)) -+#endif -+#ifndef PADLOCK_NO_RNG -+ || (PADLOCK_HAVE_RNG && !ENGINE_set_RAND (e, &padlock_rand)) -+#endif -+ ) { - return 0; - } - -@@ -213,7 +261,7 @@ - static int - padlock_init(ENGINE *e) - { -- return (padlock_use_rng || padlock_use_ace); -+ return (padlock_flags); - } - - /* This stuff is needed if this ENGINE is being compiled into a self-contained -@@ -247,7 +295,7 @@ - #define AES_KEY_SIZE_192 24 - #define AES_KEY_SIZE_256 32 - --/* Here we store the status information relevant to the -+/* Here we store the status information relevant to the - current context. */ - /* BIG FAT WARNING: - * Inline assembler in PADLOCK_XCRYPT_ASM() -@@ -306,7 +354,7 @@ - { - int result = -1; - -- /* We're checking if the bit #21 of EFLAGS -+ /* We're checking if the bit #21 of EFLAGS - can be toggled. If yes = CPUID is available. */ - asm volatile ( - "pushf\n" -@@ -322,7 +370,7 @@ - "xorl %%eax, %%ecx\n" - "movl %%ecx, %0\n" - : "=r" (result) : : "eax", "ecx"); -- -+ - return (result == 0); - } - -@@ -365,10 +413,22 @@ - : "+a"(eax), "=d"(edx) : : "ecx"); - - /* Fill up some flags */ -- padlock_use_ace = ((edx & (0x3<<6)) == (0x3<<6)); -- padlock_use_rng = ((edx & (0x3<<2)) == (0x3<<2)); -+ padlock_flags |= ((edx & (0x3<<3)) ? PADLOCK_RNG : 0); -+ padlock_flags |= ((edx & (0x3<<7)) ? PADLOCK_ACE : 0); -+ padlock_flags |= ((edx & (0x3<<9)) ? PADLOCK_ACE2 : 0); -+ padlock_flags |= ((edx & (0x3<<11)) ? PADLOCK_PHE : 0); -+ padlock_flags |= ((edx & (0x3<<13)) ? PADLOCK_PMM : 0); - -- return padlock_use_ace + padlock_use_rng; -+ return padlock_flags; -+} -+ -+static inline void -+padlock_htonl_block(uint32_t *data, size_t count) -+{ -+ while (count--) { -+ asm volatile ("bswapl %0" : "+r"(*data)); -+ data++; -+ } - } - - #ifndef OPENSSL_NO_AES -@@ -377,17 +437,14 @@ - padlock_bswapl(AES_KEY *ks) - { - size_t i = sizeof(ks->rd_key)/sizeof(ks->rd_key[0]); -- unsigned int *key = ks->rd_key; -+ uint32_t *key = (uint32_t*) ks->rd_key; - -- while (i--) { -- asm volatile ("bswapl %0" : "+r"(*key)); -- key++; -- } -+ padlock_htonl_block(key, i); - } - #endif - - /* Force key reload from memory to the CPU microcode. -- Loading EFLAGS from the stack clears EFLAGS[30] -+ Loading EFLAGS from the stack clears EFLAGS[30] - which does the trick. */ - static inline void - padlock_reload_key(void) -@@ -423,7 +480,7 @@ - } - - /* Template for padlock_xcrypt_* modes */ --/* BIG FAT WARNING: -+/* BIG FAT WARNING: - * The offsets used with 'leal' instructions - * describe items of the 'padlock_cipher_data' - * structure. -@@ -475,7 +532,7 @@ - * In case you wonder 'rep xcrypt*' instructions above are *not* - * affected by the Direction Flag and pointers advance toward - * larger addresses unconditionally. -- */ -+ */ - static inline unsigned char * - padlock_memcpy(void *dst,const void *src,size_t n) - { -@@ -501,7 +558,7 @@ - _asm _emit 0x0f _asm _emit 0xa7 \ - _asm _emit code - --/* BIG FAT WARNING: -+/* BIG FAT WARNING: - * The offsets used with 'lea' instructions - * describe items of the 'padlock_cipher_data' - * structure. -@@ -840,7 +897,7 @@ - return 1; - } - --/* -+/* - * Simplified version of padlock_aes_cipher() used when - * 1) both input and output buffers are at aligned addresses. - * or when -@@ -895,7 +952,7 @@ - # error "insane PADLOCK_CHUNK..." - #endif - --/* Re-align the arguments to 16-Bytes boundaries and run the -+/* Re-align the arguments to 16-Bytes boundaries and run the - encryption function itself. This function is not AES-specific. */ - static int - padlock_aes_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out_arg, -@@ -1157,6 +1214,514 @@ - - #endif /* OPENSSL_NO_AES */ - -+#ifndef OPENSSL_NO_SHA -+ -+#define DIGEST_DATA(ctx) ((struct padlock_digest_data *)(ctx->md_data)) -+#define PADLOCK_SHA_ALIGN(dd) (uint32_t*)(((uintptr_t)(dd) + 15) & ~15) -+#define PADLOCK_SHA_PAGES 14 -+#define PADLOCK_SHA_BUFFER (512 - sizeof(size_t) - 4*sizeof(void*)) -+#define PADLOCK_SHA_INITVECTOR_SIZE (8 * sizeof(uint32_t)) -+ -+struct padlock_digest_data { -+ union { -+ unsigned char smallbuffer[PADLOCK_SHA_BUFFER]; -+ struct { -+ unsigned char padlockctx[128+16]; -+ unsigned char *buffer; -+ size_t mmap_size; -+ uint64_t total; -+ }; -+ }; -+ void *initvector; -+ size_t used; -+ void (*hash)(void *padlockctx, const void *buf, size_t len); -+ int (*update)(EVP_MD_CTX *ctx, const void *buffer, size_t len); -+ int (*final)(EVP_MD_CTX *ctx, unsigned char *buffer); -+}; -+ -+static inline void * -+padlock_atomic_xchg(volatile void **mem, void *fixed) -+{ -+ /* No lock prefix due the xchg asserts it anyway, and the -+ * funny unsigned long* cast is required to workaround some gcc -+ * problems if compiling in PIC mode */ -+ asm volatile ( -+ "xchg %0, %1" -+ : "=r"(fixed) -+ : "m"(*(unsigned long*)mem), "0"(fixed) -+ : "memory"); -+ return fixed; -+} -+ -+static void -+padlock_do_sha1(void *padlockctx, const void *buf, size_t len) -+{ -+ asm volatile ( -+ "xsha1" -+ : "+S"(buf), "+D"(padlockctx) -+ : "c"(len), "a"(0)); -+} -+ -+static void -+padlock_do_sha256(void *padlockctx, const void *buf, size_t len) -+{ -+ asm volatile ( -+ "xsha256" -+ : "+S"(buf), "+D"(padlockctx) -+ : "c"(len), "a"(0)); -+} -+ -+static void -+handle_sigsegv(int sig, siginfo_t *info, void *uctxp) -+{ -+ ucontext_t *uctx = uctxp; -+ uctx->uc_mcontext.gregs[14] += 4; -+} -+ -+static void -+padlock_sha_nonfinalizing(struct padlock_digest_data *data) -+{ -+ struct sigaction act, oldact; -+ size_t bofs = 0; -+ -+ if (data->used != data->mmap_size) { -+ bofs = data->mmap_size - data->used; -+ memmove(&data->buffer[bofs], data->buffer, data->used); -+ } -+ -+ memset(&act, 0, sizeof(act)); -+ act.sa_sigaction = handle_sigsegv; -+ act.sa_flags = SA_SIGINFO; -+ sigaction(SIGSEGV, &act, &oldact); -+ data->hash(PADLOCK_SHA_ALIGN(data->padlockctx), -+ &data->buffer[bofs], data->used + 64); -+ sigaction(SIGSEGV, &oldact, NULL); -+} -+ -+static void -+padlock_free_buffer(void *buf) -+{ -+ buf = padlock_atomic_xchg(&padlock_cached_sha_buffer, buf); -+ if (buf != NULL) { -+ munmap(buf, (PADLOCK_SHA_PAGES + 1) * getpagesize()); -+ } -+} -+ -+static void * -+padlock_allocate_buffer(size_t *maxsize) -+{ -+ void *buf; -+ size_t size, page; -+ -+ page = getpagesize(); -+ buf = padlock_atomic_xchg(&padlock_cached_sha_buffer, NULL); -+ if (buf != NULL) -+ goto ret; -+ -+ size = (PADLOCK_SHA_PAGES + 1) * page; -+ buf = mmap(0, size, PROT_READ | PROT_WRITE, -+ MAP_PRIVATE | MAP_ANONYMOUS, 0, 0); -+ if (buf == NULL) -+ return NULL; -+ -+ /* Try locking the pages to avoid swapping, but don't fail if -+ * we are over quota. */ -+ mlock(buf, size); -+ -+ if (mprotect(buf + PADLOCK_SHA_PAGES * page, page, PROT_NONE) < 0) { -+ munmap(buf, size); -+ return NULL; -+ } -+ -+ret: -+ *maxsize = PADLOCK_SHA_PAGES * page - 64; -+ -+ return buf; -+} -+ -+static int -+padlock_multi_update(EVP_MD_CTX *ctx, const void *data, size_t len) -+{ -+ struct padlock_digest_data *ddata = DIGEST_DATA(ctx); -+ size_t chunk_size; -+ -+ if (ddata->buffer == NULL) -+ ddata->buffer = padlock_allocate_buffer(&ddata->mmap_size); -+ -+ while (len) { -+ if (ddata->used + len < ddata->mmap_size) { -+ memcpy(&ddata->buffer[ddata->used], data, len); -+ ddata->used += len; -+ ddata->total += len; -+ return 1; -+ } -+ -+ chunk_size = ddata->mmap_size - ddata->used; -+ memcpy(&ddata->buffer[ddata->used], data, chunk_size); -+ -+ data += chunk_size; -+ len -= chunk_size; -+ ddata->used = ddata->mmap_size; -+ ddata->total += chunk_size; -+ padlock_sha_nonfinalizing(ddata); -+ ddata->used = 0; -+ } -+ -+ return 1; -+} -+ -+static int -+padlock_oneshot_final(EVP_MD_CTX *ctx, unsigned char *md) -+{ -+ struct padlock_digest_data *ddata = DIGEST_DATA(ctx); -+ size_t size = EVP_MD_CTX_size(ctx); -+ -+ memcpy(md, PADLOCK_SHA_ALIGN(ddata->padlockctx), size); -+ return 1; -+} -+ -+static int -+padlock_copy_final(EVP_MD_CTX *ctx, unsigned char *md) -+{ -+ struct padlock_digest_data *ddata = DIGEST_DATA(ctx); -+ char padlockctx[128+16]; -+ void *aligned = PADLOCK_SHA_ALIGN(padlockctx); -+ size_t size = EVP_MD_CTX_size(ctx); -+ -+ memcpy(aligned, ddata->initvector, PADLOCK_SHA_INITVECTOR_SIZE); -+ ddata->hash(aligned, ddata->smallbuffer, ddata->used); -+ padlock_htonl_block(aligned, size / sizeof(uint32_t)); -+ memcpy(md, aligned, size); -+ -+ return 1; -+} -+ -+static int -+padlock_multi_final(EVP_MD_CTX *ctx, unsigned char *md) -+{ -+ static const char padding[64] = { 0x80, }; -+ struct padlock_digest_data *ddata = DIGEST_DATA(ctx); -+ size_t mdsize = EVP_MD_CTX_size(ctx); -+ void *aligned = PADLOCK_SHA_ALIGN(ddata->padlockctx); -+ -+ if (ddata->used == ddata->total) { -+ /* Sweet, everything fits in one buffer. */ -+ ddata->hash(aligned, ddata->buffer, ddata->used); -+ } else { -+ /* Hardware already hashed some buffers. -+ * Do finalizing manually */ -+ union { -+ uint64_t u64; -+ uint32_t u32[2]; -+ } bits_le, bits; -+ size_t lastblocklen, padlen; -+ -+ /* BigEndianise the length. */ -+ bits_le.u64 = ddata->total * 8; -+ bits.u32[1] = htonl(bits_le.u32[0]); -+ bits.u32[0] = htonl(bits_le.u32[1]); -+ -+ /* Append padding, leave space for length. */ -+ lastblocklen = ddata->total & 63; -+ padlen = (lastblocklen < 56) ? (56 - lastblocklen) : ((64+56) - lastblocklen); -+ padlock_multi_update(ctx, padding, padlen); -+ -+ /* Length in BigEndian64 */ -+ padlock_multi_update(ctx, (const char *) &bits, sizeof(bits)); -+ -+ /* And finally calculate it */ -+ padlock_sha_nonfinalizing(ddata); -+ } -+ padlock_htonl_block(aligned, mdsize / sizeof(uint32_t)); -+ memcpy(md, aligned, mdsize); -+ -+ return 1; -+} -+ -+static int -+padlock_copy_update(EVP_MD_CTX *ctx, const void *data, size_t len) -+{ -+ struct padlock_digest_data *ddata = DIGEST_DATA(ctx); -+ -+ if (ddata->used + len > sizeof(ddata->smallbuffer)) { -+ ddata->update = padlock_multi_update; -+ ddata->final = padlock_multi_final; -+ -+ if (ddata->used != 0) { -+ void *buffer; -+ size_t mmap_size; -+ -+ buffer = padlock_allocate_buffer(&mmap_size); -+ memcpy(buffer, ddata->smallbuffer, ddata->used); -+ ddata->buffer = buffer; -+ ddata->total = ddata->used; -+ ddata->mmap_size = mmap_size; -+ } else { -+ ddata->buffer = NULL; -+ ddata->total = 0; -+ } -+ -+ memcpy(PADLOCK_SHA_ALIGN(ddata->padlockctx), ddata->initvector, -+ PADLOCK_SHA_INITVECTOR_SIZE); -+ -+ return padlock_multi_update(ctx, data, len); -+ } -+ -+ memcpy(&ddata->smallbuffer[ddata->used], data, len); -+ ddata->used += len; -+ -+ return 1; -+} -+ -+static int -+padlock_oneshot_update(EVP_MD_CTX *ctx, const void *data, size_t len) -+{ -+ struct padlock_digest_data *ddata = DIGEST_DATA(ctx); -+ void *aligned = PADLOCK_SHA_ALIGN(ddata->padlockctx); -+ size_t mdsize = EVP_MD_CTX_size(ctx); -+ -+ /* Oneshot update is only possible if context flags indicate so */ -+ if (!(ctx->flags & EVP_MD_CTX_FLAG_ONESHOT)) { -+ ddata->update = padlock_copy_update; -+ ddata->final = padlock_copy_final; -+ return padlock_copy_update(ctx, data, len); -+ } -+ -+ memcpy(aligned, ddata->initvector, PADLOCK_SHA_INITVECTOR_SIZE); -+ ddata->hash(aligned, data, len); -+ padlock_htonl_block(aligned, mdsize / sizeof(uint32_t)); -+ ddata->used += len; -+ -+ return 1; -+} -+ -+static int -+padlock_sha_init(struct padlock_digest_data *ddata) -+{ -+ ddata->used = 0; -+ ddata->update = padlock_oneshot_update; -+ ddata->final = padlock_oneshot_final; -+ -+ return 1; -+} -+ -+static int -+padlock_sha1_init(EVP_MD_CTX *ctx) -+{ -+ static uint32_t sha1_initvector[8] = { -+ 0x67452301, 0xEFCDAB89, 0x98BADCFE, 0x10325476, -+ 0xC3D2E1F0 -+ }; -+ struct padlock_digest_data *ddata = DIGEST_DATA(ctx); -+ -+ ddata->hash = padlock_do_sha1; -+ ddata->initvector = sha1_initvector; -+ return padlock_sha_init(ddata); -+} -+ -+static int -+padlock_sha224_init(EVP_MD_CTX *ctx) -+{ -+ static uint32_t sha224_initvector[] = { -+ 0xC1059ED8, 0x367CD507, 0x3070DD17, 0xF70E5939, -+ 0xFFC00B31, 0x68581511, 0x64F98FA7, 0xBEFA4FA4, -+ }; -+ struct padlock_digest_data *ddata = DIGEST_DATA(ctx); -+ -+ ddata->hash = padlock_do_sha256; -+ ddata->initvector = sha224_initvector; -+ return padlock_sha_init(ddata); -+} -+ -+static int -+padlock_sha256_init(EVP_MD_CTX *ctx) -+{ -+ static uint32_t sha256_initvector[] = { -+ 0x6A09E667, 0xBB67AE85, 0x3C6EF372, 0xA54FF53A, -+ 0x510E527F, 0x9B05688C, 0x1F83D9AB, 0x5BE0CD19 -+ }; -+ struct padlock_digest_data *ddata = DIGEST_DATA(ctx); -+ -+ ddata->hash = padlock_do_sha256; -+ ddata->initvector = sha256_initvector; -+ return padlock_sha_init(ddata); -+} -+ -+static int -+padlock_sha_update(EVP_MD_CTX *ctx, const void *data, size_t length) -+{ -+ return DIGEST_DATA(ctx)->update(ctx, data, length); -+} -+ -+static int -+padlock_sha_final(EVP_MD_CTX *ctx, unsigned char *md) -+{ -+ return DIGEST_DATA(ctx)->final(ctx, md); -+} -+ -+static int -+padlock_sha_copy(EVP_MD_CTX *to, const EVP_MD_CTX *from) -+{ -+ struct padlock_digest_data *dfrom = DIGEST_DATA(from); -+ struct padlock_digest_data *dto = DIGEST_DATA(to); -+ -+ /* When we get here, dto is already a memcpied from dfrom, -+ * it's ok for all other cases except when data is on a separate -+ * mmapped area. It would be nice if we had a flag, if this is -+ * a "finalization copy", so we could do finalizing SHA here and -+ * store the result to *to precalculated. But there's no such -+ * flag as to is reset on copy. */ -+ -+ if (dfrom->update != padlock_copy_update) { -+ /* Recopy the context, as they might have different alignment */ -+ memcpy(PADLOCK_SHA_ALIGN(dto->padlockctx), -+ PADLOCK_SHA_ALIGN(dfrom->padlockctx), -+ PADLOCK_SHA_INITVECTOR_SIZE); -+ } -+ -+ if (dfrom->update == padlock_multi_update) { -+ /* Update total, and copy the buffer */ -+ dto->total = dfrom->total - dfrom->used; -+ dto->buffer = NULL; -+ dto->used = 0; -+ dto->mmap_size = 0; -+ if (dfrom->used != 0) -+ padlock_sha_update(to, dfrom->buffer, dfrom->used); -+ } -+ -+ return 1; -+} -+ -+static int -+padlock_sha_cleanup(EVP_MD_CTX *ctx) -+{ -+ struct padlock_digest_data *ddata = DIGEST_DATA(ctx); -+ -+ if (ddata->update == padlock_multi_update && ddata->buffer != NULL) -+ padlock_free_buffer(ddata->buffer); -+ -+ return 1; -+} -+ -+static const EVP_MD padlock_sha1_md = { -+ NID_sha1, -+ NID_sha1WithRSAEncryption, -+ SHA_DIGEST_LENGTH, -+ 0, -+ padlock_sha1_init, -+ padlock_sha_update, -+ padlock_sha_final, -+ padlock_sha_copy, -+ padlock_sha_cleanup, -+ EVP_PKEY_RSA_method, -+ SHA_CBLOCK, -+ sizeof(struct padlock_digest_data), -+}; -+ -+static const EVP_MD padlock_dss1_md = { -+ NID_dsa, -+ NID_dsaWithSHA1, -+ SHA_DIGEST_LENGTH, -+ 0, -+ padlock_sha1_init, -+ padlock_sha_update, -+ padlock_sha_final, -+ padlock_sha_copy, -+ padlock_sha_cleanup, -+ EVP_PKEY_DSA_method, -+ SHA_CBLOCK, -+ sizeof(struct padlock_digest_data), -+}; -+ -+static const EVP_MD padlock_sha224_md = { -+ NID_sha224, -+ NID_sha224WithRSAEncryption, -+ SHA224_DIGEST_LENGTH, -+ 0, -+ padlock_sha224_init, -+ padlock_sha_update, -+ padlock_sha_final, -+ padlock_sha_copy, -+ padlock_sha_cleanup, -+ EVP_PKEY_RSA_method, -+ SHA_CBLOCK, -+ sizeof(struct padlock_digest_data), -+}; -+ -+static const EVP_MD padlock_sha256_md = { -+ NID_sha256, -+ NID_sha256WithRSAEncryption, -+ SHA256_DIGEST_LENGTH, -+ 0, -+ padlock_sha256_init, -+ padlock_sha_update, -+ padlock_sha_final, -+ padlock_sha_copy, -+ padlock_sha_cleanup, -+ EVP_PKEY_RSA_method, -+ SHA_CBLOCK, -+ sizeof(struct padlock_digest_data), -+}; -+ -+static int padlock_digest_nids[] = { -+#if !defined(OPENSSL_NO_SHA) -+ NID_sha1, -+ NID_dsa, -+#endif -+#if !defined(OPENSSL_NO_SHA256) -+#if !defined(OPENSSL_NO_SHA224) -+ NID_sha224, -+#endif -+ NID_sha256, -+#endif -+}; -+ -+static int padlock_digest_nids_num = sizeof(padlock_digest_nids)/sizeof(padlock_digest_nids[0]); -+ -+static int -+padlock_digests (ENGINE *e, const EVP_MD **digest, const int **nids, int nid) -+{ -+ /* No specific digest => return a list of supported nids ... */ -+ if (!digest) { -+ *nids = padlock_digest_nids; -+ return padlock_digest_nids_num; -+ } -+ -+ /* ... or the requested "digest" otherwise */ -+ switch (nid) { -+#if !defined(OPENSSL_NO_SHA) -+ case NID_sha1: -+ *digest = &padlock_sha1_md; -+ break; -+ case NID_dsa: -+ *digest = &padlock_dss1_md; -+ break; -+#endif -+ -+#if !defined(OPENSSL_NO_SHA256) -+#if !defined(OPENSSL_NO_SHA224) -+ case NID_sha224: -+ *digest = &padlock_sha224_md; -+ break; -+#endif /* OPENSSL_NO_SHA224 */ -+ -+ case NID_sha256: -+ *digest = &padlock_sha256_md; -+ break; -+#endif /* OPENSSL_NO_SHA256 */ -+ -+ default: -+ /* Sorry, we don't support this NID */ -+ *digest = NULL; -+ return 0; -+ } -+ -+ return 1; -+} -+ -+#endif /* OPENSSL_NO_SHA */ -+ -+#ifndef PADLOCK_NO_RNG - /* ===== Random Number Generator ===== */ - /* - * This code is not engaged. The reason is that it does not comply -@@ -1164,7 +1729,7 @@ - * (posted at http://www.via.com.tw/en/viac3/c3.jsp) nor does it - * provide meaningful error control... - */ --/* Wrapper that provides an interface between the API and -+/* Wrapper that provides an interface between the API and - the raw PadLock RNG */ - static int - padlock_rand_bytes(unsigned char *output, int count) -@@ -1212,6 +1777,7 @@ - padlock_rand_bytes, /* pseudorand */ - padlock_rand_status, /* rand status */ - }; -+#endif /* PADLOCK_NO_RNG */ - - #endif /* COMPILE_HW_PADLOCK */ - -- cgit v1.2.3 From 8fdcdf953f865c691b01d546a0baea1a1143deeb Mon Sep 17 00:00:00 2001 From: Andrew Manison Date: Fri, 11 Jun 2010 13:17:35 +0000 Subject: Fixes for total repository build. --- main/openssl/APKBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'main') diff --git a/main/openssl/APKBUILD b/main/openssl/APKBUILD index 1bab1385f..4a0f45f1a 100644 --- a/main/openssl/APKBUILD +++ b/main/openssl/APKBUILD @@ -45,7 +45,7 @@ dev() { replaces="libcrypto openssl" default_dev # move symlinks - mv "$pkgdir"/usr/lib/*.so "$subpkgdir"/usr/lib/ + #mv "$pkgdir"/usr/lib/*.so "$subpkgdir"/usr/lib/ } libcrypto() { -- cgit v1.2.3 From 8a781cf9174eb90eac6fe5b630efbe250bf4a47a Mon Sep 17 00:00:00 2001 From: Andrew Manison Date: Sun, 11 Jul 2010 09:43:34 +0000 Subject: Fixed bug in definition of CC for make. --- main/linux-grsec/APKBUILD | 6 +++--- main/linux-pae/APKBUILD | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'main') diff --git a/main/linux-grsec/APKBUILD b/main/linux-grsec/APKBUILD index ef73e4958..b9667cd34 100644 --- a/main/linux-grsec/APKBUILD +++ b/main/linux-grsec/APKBUILD @@ -75,7 +75,7 @@ menuconfig() { build() { cd "$srcdir"/build - make CC="${CC:--gcc}" \ + make CC="${CC:-gcc}" \ KBUILD_BUILD_VERSION="$((pkgrel + 1 ))-Alpine" \ || return 1 } @@ -98,13 +98,13 @@ dev() { # kernel modules and install those as /usr/src/linux-headers, # simlar to what ubuntu does # - # this way you dont need to install the 300-400 kernel sources to + # this way you dont need to install the 300-400 kernel sources to # build a tiny kernel module # pkgdesc="Headers and script for third party modules for grsec kernel" local dir="$subpkgdir"/usr/src/linux-headers-${_abi_release} - # first we import config, run prepare to set up for building + # first we import config, run prepare to set up for building # external modules, and create the scripts mkdir -p "$dir" cp "$srcdir"/$_config "$dir"/.config diff --git a/main/linux-pae/APKBUILD b/main/linux-pae/APKBUILD index fa5b0431d..ca0b08449 100644 --- a/main/linux-pae/APKBUILD +++ b/main/linux-pae/APKBUILD @@ -71,7 +71,7 @@ menuconfig() { build() { cd "$srcdir"/build - make CC="${CC:--gcc}" \ + make CC="${CC:-gcc}" \ KBUILD_BUILD_VERSION="$((pkgrel + 1 ))-Alpine" \ || return 1 } @@ -96,13 +96,13 @@ dev() { # kernel modules and install those as /usr/src/linux-headers, # simlar to what ubuntu does # - # this way you dont need to install the 300-400 kernel sources to + # this way you dont need to install the 300-400 kernel sources to # build a tiny kernel module # pkgdesc="Headers and script for third party modules for grsec kernel" local dir="$subpkgdir"/usr/src/linux-headers-${_abi_release} - # first we import config, run prepare to set up for building + # first we import config, run prepare to set up for building # external modules, and create the scripts mkdir -p "$dir" cp "$srcdir"/$_config "$dir"/.config -- cgit v1.2.3 From a1505ba94afa5f7acf4a29172101adc52e8b0ad6 Mon Sep 17 00:00:00 2001 From: Andrew Manison Date: Sun, 11 Jul 2010 09:45:13 +0000 Subject: Bumped version, and set download from personal server to work around changes to the snort website. --- main/snort/APKBUILD | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'main') diff --git a/main/snort/APKBUILD b/main/snort/APKBUILD index 11010a3ad..7c43bbcf0 100644 --- a/main/snort/APKBUILD +++ b/main/snort/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Michael Mason # Maintainer: Natanael Copa pkgname=snort -pkgver=2.8.5.3 +pkgver=2.8.6 pkgrel=0 pkgdesc="An open source network intrusion prevention and detection system" url="http://www.snort.org/" @@ -10,7 +10,7 @@ depends= makedepends="pcre-dev libpcap-dev libnet-dev autoconf automake libtool bison flex" install="$pkgname.pre-install" subpackages="$pkgname-doc $pkgname-dev" -source="http://dl.snort.org/snort-current/snort-$pkgver.tar.gz +source="http://ansel.dnsalias.com/alpine/snort-$pkgver.tar.gz snort.initd snort.confd " @@ -22,7 +22,7 @@ build() { sed -i -e 's/^all-local:.*/all-local: $(LTLIBRARIES)/' \ src/dynamic-preprocessors/*/Makefile.am || return 1 aclocal -I m4 && autoconf && automake --add-missing && libtoolize || return 1 - + ./configure --prefix=/usr \ --sysconfdir=/etc \ --mandir=/usr/share/man \ @@ -40,6 +40,6 @@ package() { install -D -m 644 ../snort.confd "$pkgdir"/etc/conf.d/snort } -md5sums="ef02aaad54746603f2cb3236fe962128 snort-2.8.5.3.tar.gz +md5sums="b1c2d3ddb1c0a859a47c5a31d19e60ad snort-2.8.6.tar.gz ffda56f7c20f5cea1c37c971e0f1d6c9 snort.initd 446f8d2b3435b8a6be738da978670605 snort.confd" -- cgit v1.2.3 From 9896c5daeb30999e836d97664ee62506aec3b2fe Mon Sep 17 00:00:00 2001 From: Andrew Manison Date: Sat, 17 Jul 2010 15:00:45 +0000 Subject: Renamed directory for xbitmaps package to match package name. --- main/xbitmap/APKBUILD | 19 ------------------- main/xbitmaps/APKBUILD | 19 +++++++++++++++++++ 2 files changed, 19 insertions(+), 19 deletions(-) delete mode 100644 main/xbitmap/APKBUILD create mode 100644 main/xbitmaps/APKBUILD (limited to 'main') diff --git a/main/xbitmap/APKBUILD b/main/xbitmap/APKBUILD deleted file mode 100644 index 535572923..000000000 --- a/main/xbitmap/APKBUILD +++ /dev/null @@ -1,19 +0,0 @@ -# Maintainer: Natanael Copa -pkgname=xbitmaps -pkgver=1.0.1 -pkgrel=0 -pkgdesc="X.org header files with bitmaps" -url="http://xorg.freedesktop.org/" -license="custom" -depends="" -makedepends="pkgconfig" -source="http://xorg.freedesktop.org/releases/individual/data/$pkgname-$pkgver.tar.bz2" - -build () -{ - cd "$srcdir"/$pkgname-$pkgver - ./configure --prefix=/usr - make || return 1 - make DESTDIR="$pkgdir" install || return 1 -} -md5sums="b28a9840cde3c38d7c09716372fea257 xbitmaps-1.0.1.tar.bz2" diff --git a/main/xbitmaps/APKBUILD b/main/xbitmaps/APKBUILD new file mode 100644 index 000000000..535572923 --- /dev/null +++ b/main/xbitmaps/APKBUILD @@ -0,0 +1,19 @@ +# Maintainer: Natanael Copa +pkgname=xbitmaps +pkgver=1.0.1 +pkgrel=0 +pkgdesc="X.org header files with bitmaps" +url="http://xorg.freedesktop.org/" +license="custom" +depends="" +makedepends="pkgconfig" +source="http://xorg.freedesktop.org/releases/individual/data/$pkgname-$pkgver.tar.bz2" + +build () +{ + cd "$srcdir"/$pkgname-$pkgver + ./configure --prefix=/usr + make || return 1 + make DESTDIR="$pkgdir" install || return 1 +} +md5sums="b28a9840cde3c38d7c09716372fea257 xbitmaps-1.0.1.tar.bz2" -- cgit v1.2.3 From 4b1b9accb0530e72ce615488ce5afe69185aeb7b Mon Sep 17 00:00:00 2001 From: Andrew Manison Date: Sun, 18 Jul 2010 01:50:47 +0000 Subject: Added default setting for CC in APKBUILD. --- main/linux-vserver/APKBUILD | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'main') diff --git a/main/linux-vserver/APKBUILD b/main/linux-vserver/APKBUILD index d9aaf9479..8d7134936 100644 --- a/main/linux-vserver/APKBUILD +++ b/main/linux-vserver/APKBUILD @@ -37,7 +37,7 @@ prepare() { mkdir -p "$srcdir"/build cp "$srcdir"/$_config "$srcdir"/build/.config - make -C "$srcdir"/linux-$_kernver O="$srcdir"/build HOSTCC="$CC" \ + make -C "$srcdir"/linux-$_kernver O="$srcdir"/build HOSTCC="${CC:-gcc}" \ silentoldconfig } @@ -64,7 +64,7 @@ package() { INSTALL_PATH="$pkgdir"/boot rm -f "$pkgdir"/lib/modules/${_abi_release}/build \ - "$pkgdir"/lib/modules/${_abi_release}/source + "$pkgdir"/lib/modules/${_abi_release}/source rm -rf "$pkgdir"/lib/firmware install -D include/config/kernel.release \ @@ -76,17 +76,17 @@ dev() { # kernel modules and install those as /usr/src/linux-headers, # simlar to what ubuntu does # - # this way you dont need to install the 300-400 kernel sources to + # this way you dont need to install the 300-400 kernel sources to # build a tiny kernel module # pkgdesc="Headers and script for third party modules for grsec kernel" local dir="$subpkgdir"/usr/src/linux-headers-${_abi_release} - # first we import config, run prepare to set up for building + # first we import config, run prepare to set up for building # external modules, and create the scripts mkdir -p "$dir" cp "$srcdir"/$_config "$dir"/.config - make -j1 -C "$srcdir"/linux-$_kernver O="$dir" HOSTCC="$CC" \ + make -j1 -C "$srcdir"/linux-$_kernver O="$dir" HOSTCC="${CC:-gcc}" \ silentoldconfig prepare scripts # remove the stuff that poits to real sources. we want 3rd party -- cgit v1.2.3 From c219ce5497fefd709c31a3f28154a31f22569b47 Mon Sep 17 00:00:00 2001 From: Andrew Manison Date: Sun, 18 Jul 2010 16:05:45 +0000 Subject: Added default value for CC passed to build. --- main/wpa_supplicant/APKBUILD | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'main') diff --git a/main/wpa_supplicant/APKBUILD b/main/wpa_supplicant/APKBUILD index 62695bf71..bbe82e466 100644 --- a/main/wpa_supplicant/APKBUILD +++ b/main/wpa_supplicant/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa pkgname=wpa_supplicant pkgver=0.7.2 -pkgrel=1 +pkgrel=2 pkgdesc="A utility providing key negotiation for WPA wireless networks" url="http://hostap.epitest.fi/wpa_supplicant" license="GPL" @@ -17,7 +17,7 @@ _builddir="$srcdir"/$pkgname-$pkgver/$pkgname prepare() { cd "$_builddir" # Toolchain setup - echo "CC = $CC" > .config + echo "CC = ${CC:-gcc}" > .config # Basic setup echo "CONFIG_CTRL_IFACE=y" >> .config @@ -88,7 +88,7 @@ prepare() { echo "CONFIG_DELAYED_MIC_ERROR_REPORT=y" >> .config } -build() { +build() { cd "$_builddir" make LIBDIR=/lib BINDIR=/sbin || return 1 # comment out the network={ } stansas in config -- cgit v1.2.3 From 9eb6cf9b869ab197655163aaa0f77eb745b4510d Mon Sep 17 00:00:00 2001 From: Andrew Manison Date: Mon, 19 Jul 2010 02:19:01 +0000 Subject: Bumped release number to reflect change to APKBUILD --- main/linux-vserver/APKBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'main') diff --git a/main/linux-vserver/APKBUILD b/main/linux-vserver/APKBUILD index 8d7134936..912954526 100644 --- a/main/linux-vserver/APKBUILD +++ b/main/linux-vserver/APKBUILD @@ -5,7 +5,7 @@ pkgname=linux-${_flavor} pkgver=2.6.32.16 _kernver=2.6.32 -pkgrel=0 +pkgrel=1 pkgdesc="Linux kernel with vserver" url="http://linux-vserver.org/" depends="mkinitfs linux-firmware" -- cgit v1.2.3 From a232dbb67ccbf03fee94baf7efe27b12a2c872f2 Mon Sep 17 00:00:00 2001 From: Andrew Manison Date: Mon, 19 Jul 2010 02:20:02 +0000 Subject: Bumped release to reflect change to APKBUILD --- main/linux-pae/APKBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'main') diff --git a/main/linux-pae/APKBUILD b/main/linux-pae/APKBUILD index ca0b08449..261708193 100644 --- a/main/linux-pae/APKBUILD +++ b/main/linux-pae/APKBUILD @@ -4,7 +4,7 @@ _flavor=pae pkgname=linux-${_flavor} pkgver=2.6.32.15 _kernver=2.6.32 -pkgrel=0 +pkgrel=1 pkgdesc="Linux kernel with PAE enabled" url=http://www.kernel.org depends="mkinitfs linux-firmware" -- cgit v1.2.3 From 7ca6493b97dda8aa85939638490f9c11bb64e7e8 Mon Sep 17 00:00:00 2001 From: Andrew Manison Date: Mon, 19 Jul 2010 02:20:42 +0000 Subject: Bumped release to reflect change to APKBUILD --- main/linux-grsec/APKBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'main') diff --git a/main/linux-grsec/APKBUILD b/main/linux-grsec/APKBUILD index ce3c1b3f3..07993f965 100644 --- a/main/linux-grsec/APKBUILD +++ b/main/linux-grsec/APKBUILD @@ -4,7 +4,7 @@ _flavor=grsec pkgname=linux-${_flavor} pkgver=2.6.32.16 _kernver=2.6.32 -pkgrel=2 +pkgrel=3 pkgdesc="Linux kernel with grsecurity" url=http://grsecurity.net depends="mkinitfs linux-firmware" -- cgit v1.2.3