diff options
33 files changed, 310 insertions, 1101 deletions
diff --git a/main/alpine-base/APKBUILD b/main/alpine-base/APKBUILD index 772e042276..ee57840da5 100644 --- a/main/alpine-base/APKBUILD +++ b/main/alpine-base/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=alpine-base -pkgver=2.4.0_rc2 +pkgver=2.4.0_rc3 pkgrel=0 pkgdesc="Meta package for minimal alpine base" url="http://alpinelinux.org" diff --git a/main/alpine-conf/0001-setup-acf-use-new-location-for-mini_httpd.conf.patch b/main/alpine-conf/0001-setup-acf-use-new-location-for-mini_httpd.conf.patch new file mode 100644 index 0000000000..4481c3270a --- /dev/null +++ b/main/alpine-conf/0001-setup-acf-use-new-location-for-mini_httpd.conf.patch @@ -0,0 +1,34 @@ +From 4b22b926721293e23fa645c742f5f274a601de9f Mon Sep 17 00:00:00 2001 +From: Natanael Copa <ncopa@alpinelinux.org> +Date: Wed, 2 May 2012 08:49:56 +0000 +Subject: [PATCH] setup-acf: use new location for mini_httpd.conf + +--- + setup-acf.in | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/setup-acf.in b/setup-acf.in +index 9e1489f..91113c5 100644 +--- a/setup-acf.in ++++ b/setup-acf.in +@@ -87,7 +87,7 @@ EOF + mv $CRTFILE $PEMFILE + fi + +-cat >/etc/mini_httpd.conf <<EOF ++cat >/etc/mini_httpd/mini_httpd.conf <<EOF + nochroot + dir=/var/www/localhost/htdocs + user=nobody +@@ -97,7 +97,7 @@ port=443 + ssl + EOF + if [ -n "$address" ]; then +- echo "host=$address" >> /etc/mini_httpd.conf ++ echo "host=$address" >> /etc/mini_httpd/mini_httpd.conf + fi + + rc-update -q add mini_httpd default +-- +1.7.10 + diff --git a/main/alpine-conf/APKBUILD b/main/alpine-conf/APKBUILD index 5037f46690..1235b3375f 100644 --- a/main/alpine-conf/APKBUILD +++ b/main/alpine-conf/APKBUILD @@ -1,12 +1,13 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=alpine-conf pkgver=2.11.0 -pkgrel=1 +pkgrel=2 pkgdesc="Alpine configuration management scripts" url=http://git.alpinelinux.org/cgit/$pkgname depends="openrc" source="http://git.alpinelinux.org/cgit/$pkgname/snapshot/$pkgname-$pkgver.tar.bz2 0001-lbu-do-not-include-var-lib-apk-world-in-apkovl.patch + 0001-setup-acf-use-new-location-for-mini_httpd.conf.patch " arch="all" @@ -38,4 +39,5 @@ package() { done } md5sums="b26bf91d4c3df7baf5ede8ab4f54225a alpine-conf-2.11.0.tar.bz2 -8ffcadf4c724296fb2d86d91ba965187 0001-lbu-do-not-include-var-lib-apk-world-in-apkovl.patch" +8ffcadf4c724296fb2d86d91ba965187 0001-lbu-do-not-include-var-lib-apk-world-in-apkovl.patch +ea6008b3c6d07c816f4eb3a185b7785d 0001-setup-acf-use-new-location-for-mini_httpd.conf.patch" diff --git a/main/apk-tools/0001-db-strip-leading-and-trailing-slashes-from-protected.patch b/main/apk-tools/0001-db-strip-leading-and-trailing-slashes-from-protected.patch new file mode 100644 index 0000000000..8f11204bec --- /dev/null +++ b/main/apk-tools/0001-db-strip-leading-and-trailing-slashes-from-protected.patch @@ -0,0 +1,30 @@ +From 38c1e65afbb334af0107c6bdd5362303473d866f Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi> +Date: Tue, 1 May 2012 14:30:06 +0300 +Subject: [PATCH 1/2] db: strip leading and trailing slashes from protected + path spec + +--- + src/database.c | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/src/database.c b/src/database.c +index 26774be..bcc707f 100644 +--- a/src/database.c ++++ b/src/database.c +@@ -1181,6 +1181,12 @@ static int add_protected_path(void *ctx, apk_blob_t blob) + break; + } + ++ /* skip leading and trailing path separators */ ++ while (blob.len && blob.ptr[0] == '/') ++ blob.ptr++, blob.len--; ++ while (blob.len && blob.ptr[blob.len-1] == '/') ++ blob.len--; ++ + *apk_protected_path_array_add(&db->protected_paths) = (struct apk_protected_path) { + .relative_pattern = apk_blob_cstr(blob), + .protected = protected, +-- +1.7.10 + diff --git a/main/apk-tools/0002-audit-apply-protected_paths.d-masks-to-individual-fi.patch b/main/apk-tools/0002-audit-apply-protected_paths.d-masks-to-individual-fi.patch new file mode 100644 index 0000000000..84989a7511 --- /dev/null +++ b/main/apk-tools/0002-audit-apply-protected_paths.d-masks-to-individual-fi.patch @@ -0,0 +1,56 @@ +From c9a43a14697fa955f31e495a8b03a523975ad285 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi> +Date: Tue, 1 May 2012 15:40:31 +0300 +Subject: [PATCH 2/2] audit: apply protected_paths.d masks to individual files + +--- + src/audit.c | 21 ++++++++++++++++++--- + 1 file changed, 18 insertions(+), 3 deletions(-) + +diff --git a/src/audit.c b/src/audit.c +index 071ff4d..03f977b 100644 +--- a/src/audit.c ++++ b/src/audit.c +@@ -14,6 +14,7 @@ + #include <fcntl.h> + #include <unistd.h> + #include <dirent.h> ++#include <fnmatch.h> + #include <sys/stat.h> + #include "apk_applet.h" + #include "apk_database.h" +@@ -199,14 +200,28 @@ recurse_check: + atctx->pathlen--; + } else { + struct apk_db_file *dbf; ++ struct apk_protected_path_array *ppaths = dbd->protected_paths; ++ int i, protected = dbd->protected, symlinks_only = dbd->symlinks_only; ++ ++ /* inherit file's protection mask */ ++ for (i = 0; i < ppaths->num; i++) { ++ struct apk_protected_path *ppath = &ppaths->item[i]; ++ char *slash = strchr(ppath->relative_pattern, '/'); ++ if (slash == NULL) { ++ if (fnmatch(ppath->relative_pattern, name, FNM_PATHNAME) != 0) ++ continue; ++ protected = ppath->protected; ++ symlinks_only = ppath->symlinks_only; ++ } ++ } + + if (actx->mode == MODE_BACKUP) { +- if (!dbd->protected) ++ if (!protected) + goto done; +- if (dbd->symlinks_only && !S_ISLNK(fi.mode)) ++ if (symlinks_only && !S_ISLNK(fi.mode)) + goto done; + } else { +- if (dbd->protected) ++ if (protected) + goto done; + } + +-- +1.7.10 + diff --git a/main/apk-tools/APKBUILD b/main/apk-tools/APKBUILD index 4eabd16fce..bd3f542544 100644 --- a/main/apk-tools/APKBUILD +++ b/main/apk-tools/APKBUILD @@ -1,12 +1,14 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=apk-tools pkgver=2.3.1 -pkgrel=0 +pkgrel=1 pkgdesc="Alpine Package Keeper - package manager for alpine" subpackages="$pkgname-static lua-apk:luaapk" depends= makedepends="zlib-dev openssl-dev lua-dev" source="http://git.alpinelinux.org/cgit/$pkgname/snapshot/$pkgname-$pkgver.tar.bz2 + 0001-db-strip-leading-and-trailing-slashes-from-protected.patch + 0002-audit-apply-protected_paths.d-masks-to-individual-fi.patch " url="http://git.alpinelinux.org/cgit/apk-tools/" @@ -58,4 +60,6 @@ luaapk() { mv "$pkgdir"/usr/lib "$subpkgdir"/usr/lib/ } -md5sums="e343935cc2680a42f3da0f442045f046 apk-tools-2.3.1.tar.bz2" +md5sums="e343935cc2680a42f3da0f442045f046 apk-tools-2.3.1.tar.bz2 +cc7c61312f403280dcb4c04eca53df81 0001-db-strip-leading-and-trailing-slashes-from-protected.patch +1156d61cd9ea475ebac209e1dec1175f 0002-audit-apply-protected_paths.d-masks-to-individual-fi.patch" diff --git a/main/busybox/0001-unzip-ignore-chmod-errors-so-unzipping-on-FAT-works.patch b/main/busybox/0001-unzip-ignore-chmod-errors-so-unzipping-on-FAT-works.patch new file mode 100644 index 0000000000..72518fd514 --- /dev/null +++ b/main/busybox/0001-unzip-ignore-chmod-errors-so-unzipping-on-FAT-works.patch @@ -0,0 +1,67 @@ +From 414005993f9b015b5feb28fa8f823112331f89a3 Mon Sep 17 00:00:00 2001 +From: Natanael Copa <ncopa@alpinelinux.org> +Date: Tue, 1 May 2012 15:09:28 +0200 +Subject: [PATCH] unzip: ignore chmod errors so unzipping on FAT works + +--- + archival/unzip.c | 4 ++-- + include/libbb.h | 1 + + libbb/make_directory.c | 7 ++++++- + 3 files changed, 9 insertions(+), 3 deletions(-) + +diff --git a/archival/unzip.c b/archival/unzip.c +index 4fa7293..e60bc82 100644 +--- a/archival/unzip.c ++++ b/archival/unzip.c +@@ -594,8 +594,8 @@ int unzip_main(int argc, char **argv) + printf(" creating: %s\n", dst_fn); + } + unzip_create_leading_dirs(dst_fn); +- if (bb_make_directory(dst_fn, dir_mode, 0)) { +- bb_error_msg_and_die("exiting"); ++ if (bb_make_directory(dst_fn, dir_mode, FILEUTILS_IGNORE_CHMOD_ERR)) { ++ xfunc_die(); + } + } else { + if (!S_ISDIR(stat_buf.st_mode)) { +diff --git a/include/libbb.h b/include/libbb.h +index 63d0419..83a1a4d 100644 +--- a/include/libbb.h ++++ b/include/libbb.h +@@ -331,6 +331,7 @@ enum { /* DO NOT CHANGE THESE VALUES! cp.c, mv.c, install.c depend on them. */ + FILEUTILS_PRESERVE_SECURITY_CONTEXT = 1 << 9, /* -c */ + FILEUTILS_SET_SECURITY_CONTEXT = 1 << 10, + #endif ++ FILEUTILS_IGNORE_CHMOD_ERR = 1 << 11, + }; + #define FILEUTILS_CP_OPTSTR "pdRfilsLH" IF_SELINUX("c") + extern int remove_file(const char *path, int flags) FAST_FUNC; +diff --git a/libbb/make_directory.c b/libbb/make_directory.c +index 72303e7..7826b90 100644 +--- a/libbb/make_directory.c ++++ b/libbb/make_directory.c +@@ -107,6 +107,10 @@ int FAST_FUNC bb_make_directory(char *path, long mode, int flags) + * an error. */ + if ((mode != -1) && (chmod(path, mode) < 0)) { + fail_msg = "set permissions of"; ++ if (flags & FILEUTILS_IGNORE_CHMOD_ERR) { ++ flags = 0; ++ goto print_err; ++ } + break; + } + goto ret0; +@@ -116,8 +120,9 @@ int FAST_FUNC bb_make_directory(char *path, long mode, int flags) + *s = c; + } /* while (1) */ + +- bb_perror_msg("can't %s directory '%s'", fail_msg, path); + flags = -1; ++ print_err: ++ bb_perror_msg("can't %s directory '%s'", fail_msg, path); + goto ret; + ret0: + flags = 0; +-- +1.7.10 + diff --git a/main/busybox/APKBUILD b/main/busybox/APKBUILD index 55512e501d..0cf32cb3bf 100644 --- a/main/busybox/APKBUILD +++ b/main/busybox/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=busybox pkgver=1.19.4 -pkgrel=2 +pkgrel=3 pkgdesc="Size optimized toolbox of many common UNIX utilities" url=http://busybox.net arch="all" @@ -23,6 +23,7 @@ source="http://busybox.net/downloads/$pkgname-$pkgver.tar.bz2 0001-acpid-do-not-install-handlers-for-fatal-signals.patch 0001-grep-support-for-x-match-whole-line.patch 0001-tar-Implement-no-recursion.patch + 0001-unzip-ignore-chmod-errors-so-unzipping-on-FAT-works.patch busyboxconfig" @@ -96,4 +97,5 @@ b5375210f13fd6e1ca61a565e8fabd35 busybox-uname-is-not-gnu.patch cfafb917f777437f428ea97da0a63915 0001-acpid-do-not-install-handlers-for-fatal-signals.patch 699701047d05468a13e5c37b5ebc3824 0001-grep-support-for-x-match-whole-line.patch b0977368029587bab23067f0267ae309 0001-tar-Implement-no-recursion.patch +d13491d62d8987f79c385f6fdd94836a 0001-unzip-ignore-chmod-errors-so-unzipping-on-FAT-works.patch 42e2f49483e650193c0e142ade7de142 busyboxconfig" diff --git a/main/dahdi-linux-vserver/APKBUILD b/main/dahdi-linux-vserver/APKBUILD index ce3749581c..62152719ef 100644 --- a/main/dahdi-linux-vserver/APKBUILD +++ b/main/dahdi-linux-vserver/APKBUILD @@ -4,7 +4,7 @@ _flavor=${FLAVOR:-vserver} _realname=dahdi-linux _name=$_realname-$_flavor -_kver=3.3.3 +_kver=3.3.4 _kpkgrel=0 _myvsver=vs2.3.3.3 diff --git a/main/linux-vserver/APKBUILD b/main/linux-vserver/APKBUILD index 9b51d884c4..d370f6f71d 100644 --- a/main/linux-vserver/APKBUILD +++ b/main/linux-vserver/APKBUILD @@ -2,7 +2,7 @@ _flavor=vserver pkgname=linux-${_flavor} -pkgver=3.3.3 +pkgver=3.3.4 pkgrel=0 _vsver=vs2.3.3.3 @@ -133,7 +133,7 @@ dev() { } md5sums="7133f5a2086a7d7ef97abac610c094f5 linux-3.3.tar.xz -634a088d3789870885dc6ee1eb9627d4 patch-3.3.3.xz -2c11fe3a0bfddb0c23021b84b7a50f82 patch-3.3.3-vs2.3.3.3.diff +9c4cc16f10b645fbb90f6c05ad388883 patch-3.3.4.xz +ef60f2dd311139ccac1848b1522fde90 patch-3.3.4-vs2.3.3.3.diff 4b8d805a0eec790472432a39be02f453 kernelconfig.x86 94555ed5003cd2fc61f7d0e8d6ceb558 kernelconfig.x86_64" diff --git a/main/mini_httpd/APKBUILD b/main/mini_httpd/APKBUILD index c62aec1398..eef36c5235 100644 --- a/main/mini_httpd/APKBUILD +++ b/main/mini_httpd/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=mini_httpd pkgver=1.19 -pkgrel=6 +pkgrel=7 pkgdesc="Small forking webserver with ssl and ipv6 support" url="http://www.acme.com/software/mini_httpd/" arch="all" @@ -9,6 +9,7 @@ license="BSD" depends="logrotate" makedepends="openssl-dev" subpackages="$pkgname-doc" +install="$pkgname.pre-install $pkgname.pre-upgrade" source="http://www.acme.com/software/mini_httpd/$pkgname-$pkgver.tar.gz $pkgname.conf.sample $pkgname.initd @@ -35,7 +36,7 @@ build() { mkdir -p "$pkgdir"/var/www/localhost/htdocs install -D -m644 ../mini_httpd.conf.sample \ - "$pkgdir"/etc/mini_httpd.conf + "$pkgdir"/etc/mini_httpd/mini_httpd.conf install -D -m755 ../mini_httpd.initd "$pkgdir"/etc/init.d/mini_httpd install -D -m644 ../mini_httpd.logrotate \ "$pkgdir"/etc/logrotate.d/mini_httpd @@ -43,6 +44,6 @@ build() { } md5sums="7c68293ad265ecfe2edea917912f6f1f mini_httpd-1.19.tar.gz -bca5b3b1cdc00cf31f0b54797518b893 mini_httpd.conf.sample -02a9a415c365aa40c27211afbaa545c7 mini_httpd.initd +2cd6630a7e19461b31a93504a8b6b24b mini_httpd.conf.sample +3272107de6b7e832f4d0bac7ff76ec12 mini_httpd.initd 915683e9c7e1cef7ce9b1bbaa31ab680 mini_httpd.logrotate" diff --git a/main/mini_httpd/mini_httpd.conf.sample b/main/mini_httpd/mini_httpd.conf.sample index 002f4f0c7e..0ca98e0e88 100644 --- a/main/mini_httpd/mini_httpd.conf.sample +++ b/main/mini_httpd/mini_httpd.conf.sample @@ -27,8 +27,6 @@ dir=/var/www/localhost/htdocs chroot #nochroot ## -## The init.d script will override logfile here, so you need to set the -## MINI_HTTPD_OPTS in /etc/conf.d/ in order to enable the logfile option here #logfile=/var/log/mini_httpd/mini_httpd.log ## #charset=iso-8859-1 diff --git a/main/mini_httpd/mini_httpd.initd b/main/mini_httpd/mini_httpd.initd index ad1917be3e..6e84a18b65 100644..100755 --- a/main/mini_httpd/mini_httpd.initd +++ b/main/mini_httpd/mini_httpd.initd @@ -11,10 +11,14 @@ depend() { } start() { + local logfile=$(awk -F= '$1 == "logfile" { print $2 }' /etc/mini_httpd/${SVCNAME}.conf 2>/dev/null) + : ${logfile:=/var/log/mini_httpd/${SVCNAME}.log} + checkpath -d ${pidfile%/*} + checkpath -d ${logfile%/*} ebegin "Starting $SVCNAME" start-stop-daemon --quiet --start --exec /usr/sbin/mini_httpd \ --pidfile $pidfile -- -i $pidfile \ - ${MINI_HTTPD_OPTS:--C /etc/${SVCNAME}.conf -l /var/log/mini_httpd/${SVCNAME}.log} + ${MINI_HTTPD_OPTS:--C /etc/${SVCNAME}.conf -l ${logfile}} eend $? } diff --git a/main/mini_httpd/mini_httpd.pre-install b/main/mini_httpd/mini_httpd.pre-install new file mode 100644 index 0000000000..6f8eaae18c --- /dev/null +++ b/main/mini_httpd/mini_httpd.pre-install @@ -0,0 +1,9 @@ +#!/bin/sh + +# move config if needed and create compat symlink +if [ -f /etc/mini_httpd.conf ] && ! [ -L /etc/mini_httpd.conf ]; then + mkdir -p /etc/mini_httpd + mv /etc/mini_httpd.conf /etc/mini_httpd/mini_httpd.conf \ + && ln -s mini_httpd/mini_httpd.conf /etc/mini_httpd.conf +fi +exit 0 diff --git a/main/mini_httpd/mini_httpd.pre-upgrade b/main/mini_httpd/mini_httpd.pre-upgrade new file mode 120000 index 0000000000..19e0fba2a6 --- /dev/null +++ b/main/mini_httpd/mini_httpd.pre-upgrade @@ -0,0 +1 @@ +mini_httpd.pre-install
\ No newline at end of file diff --git a/main/open-vm-tools-vserver/APKBUILD b/main/open-vm-tools-vserver/APKBUILD index ce4a6a7713..9c84d6ead3 100644 --- a/main/open-vm-tools-vserver/APKBUILD +++ b/main/open-vm-tools-vserver/APKBUILD @@ -3,7 +3,7 @@ _flavor=vserver _realname=open-vm-tools _name=$_realname-$_flavor -_kver=3.3.3 +_kver=3.3.4 _kpkgrel=0 _myvsver=vs2.3.3.3 _mypkgrel=1 diff --git a/main/openrc/APKBUILD b/main/openrc/APKBUILD index 1041b55625..4a78481cab 100644 --- a/main/openrc/APKBUILD +++ b/main/openrc/APKBUILD @@ -2,7 +2,7 @@ pkgname=openrc pkgver=0.9.8.4 _ver=${pkgver/_git*/} -pkgrel=0 +pkgrel=1 pkgdesc="OpenRC manages the services, startup and shutdown of a host" url="http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git" arch="all" @@ -74,7 +74,7 @@ bc4f9ccd4036f9c458b89afe877fa8c2 0001-sysctl-Use-dev-null-instead-of-q.patch ce6ccda132e579cd2464b8f72daa3d2e hwclock-hctosys.patch ddb34ea87994df3126f5e6b7e8f9ac93 swap-umount-tmpfs.patch c32e15b0858eef708497e7ee6355a055 hostname.initd -b1e64885f301166df30be3e3cf5338ff hwdrivers.initd +78e9f0df010ac8095c5e76a91a1d3b12 hwdrivers.initd 33ca3e558c42cdd17adccbc7807298f7 keymaps.initd 098a1f16812f56fcb56eb6b6f0fa31f6 modules.initd d10c4fd412faf0b970bb470f493fe718 modloop.initd diff --git a/main/openrc/hwdrivers.initd b/main/openrc/hwdrivers.initd index 3d0ebf12b5..d4551ca234 100644 --- a/main/openrc/hwdrivers.initd +++ b/main/openrc/hwdrivers.initd @@ -22,6 +22,12 @@ start() { # we run it twice so we detect all devices find /sys -name modalias | xargs sort -u \ | xargs modprobe -a 2> /dev/null + + # check if framebuffer drivers got pulled in + if [ -e /sys/module/fb ] && ! [ -e /sys/module/fbcon ]; then + modprobe fbcon + fi + eend 0 } diff --git a/main/samba/APKBUILD b/main/samba/APKBUILD index c89fa1327f..3badb2427e 100644 --- a/main/samba/APKBUILD +++ b/main/samba/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=samba pkgver=3.6.4 -pkgrel=0 +pkgrel=1 pkgdesc="Tools to access a server's filespace and printers via SMB" url="http://www.samba.org" arch="all" @@ -154,6 +154,6 @@ client() { md5sums="d8e070e2a3b12f202f347e4427469bc2 samba-3.6.4.tar.gz -f0b8d460ad4af28266ac8bc1d6fa0d31 samba.initd +044c756d3c33c2d610c40bcd76cfb75c samba.initd c150433426e18261e6e3eed3930e1a76 samba.confd b7cafabfb4fa5b3ab5f2e857d8d1c733 samba.logrotate" diff --git a/main/samba/samba.initd b/main/samba/samba.initd index 6fd817da06..c352f4304f 100644 --- a/main/samba/samba.initd +++ b/main/samba/samba.initd @@ -1,59 +1,65 @@ #!/sbin/runscript -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License, v2 or later -# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/files/3.6/samba.initd,v 1.3 2011/09/14 22:52:33 polynomial-c Exp $ extra_started_commands="reload" +DAEMON=${SVCNAME#samba.} +if [ "$DAEMON" != "samba" ]; then + daemon_list=$DAEMON +fi + depend() { - after slapd firewall need net - use cupsd -} - -DAEMONNAME="${SVCNAME##samba.}" -[ "${DAEMONNAME}" != "samba" ] && daemon_list=${DAEMONNAME} - -signal_do() { - local signal="$1" - [ -z "${signal}" ] && return 0 - - local result=0 last_result=0 daemon= cmd_exec= - for daemon in ${daemon_list} ; do - eval cmd_exec=\$${daemon}_${signal} - if [ -n "${cmd_exec}" ]; then - ebegin "${my_service_name} -> ${signal}: ${daemon}" - #echo ${cmd} '->' ${!cmd} - ${cmd_exec} > /dev/null - last_result=$? - eend ${last_result} - fi - result=$(( ${result} + ${last_result} )) - done - return ${result} + after firewall +} + +start_smbd() { + start-stop-daemon --start --quiet --exec /usr/sbin/smbd -- \ + ${smbd_options:-"-D"} +} + +stop_smbd() { + start-stop-daemon --stop --quiet --pidfile /var/run/samba/smbd.pid +} + +start_nmbd() { + start-stop-daemon --start --quiet --exec /usr/sbin/nmbd -- \ + ${nmbd_options:-"-D"} +} + +stop_nmbd() { + start-stop-daemon --stop --quiet --pidfile /var/run/samba/nmbd.pid +} + +start_winbindd() { + start-stop-daemon --start --quiet --exec /usr/sbin/winbindd -- \ + $winbindd_options } -mkdir_sambadirs() { - [ -d /var/run/samba ] || mkdir -p /var/run/samba +stop_winbindd() { + start-stop-daemon --stop --quiet --pidfile /var/run/samba/winbindd.pid } start() { - ${my_service_PRE} - mkdir_sambadirs - signal_do start && return 0 - - eerror "Error: starting services (see system logs)" - signal_do stop - return 1 + for i in $daemon_list; do + ebegin "Starting $i" + start_$i + eend $? + done } + stop() { - ${my_service_PRE} - if signal_do stop ; then - ${my_service_POST} - return 0 - fi + for i in $daemon_list; do + ebegin "Stopping $i" + stop_$i + eend $? + done } + reload() { - ${my_service_PRE} - signal_do reload + for i in $daemon_list; do + ebegin "Reloading $i" + killall -HUP $i + eend $? + done } + diff --git a/testing/freeswitch-sounds-music-8000/APKBUILD b/testing/freeswitch-sounds-music-8000/APKBUILD deleted file mode 100644 index 64a18301aa..0000000000 --- a/testing/freeswitch-sounds-music-8000/APKBUILD +++ /dev/null @@ -1,28 +0,0 @@ -# Contributor: -# Maintainer: Natanael Copa <ncopa@alpinelinux.org> -pkgname=freeswitch-sounds-music-8000 -pkgver=1.0.8 -pkgrel=0 -pkgdesc="Sounds for freeswitch Music" -url="http://files.freeswitch.org/" -arch="all" -license="unknown" -depends= -makedepends= -install= -subpackages= -source="http://files.freeswitch.org/freeswitch-sounds-music-8000-$pkgver.tar.gz" - -_builddir="$srcdir"/$pkgname-$pkgver - -build() { - return 0 -} - -package() { - mkdir -p "$pkgdir"/usr/sounds/ - cp -ra "$srcdir"/ "$pkgdir"/usr/sounds -} - -md5sums="f63ef3cc3507af079ae5c7b8b8a01e42 freeswitch-sounds-music-8000-$pkgver.tar.gz" - diff --git a/testing/gdnsd/APKBUILD b/testing/gdnsd/APKBUILD index c89aae670b..6da9d6caad 100644 --- a/testing/gdnsd/APKBUILD +++ b/testing/gdnsd/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=gdnsd pkgver=1.6.2 -pkgrel=1 +pkgrel=2 pkgdesc="Geographic Authoritative DNS server" url="http://code.google.com/p/gdnsd/" arch="all" @@ -12,7 +12,8 @@ depends_dev="" makedepends="libev-dev libcap-dev" install="$pkgname.pre-install" subpackages="$pkgname-dev $pkgname-doc" -source="http://gdnsd.googlecode.com/files/gdnsd-$pkgver.tar.xz" +source="http://gdnsd.googlecode.com/files/gdnsd-$pkgver.tar.xz + gdnsd.initd" _builddir="$srcdir"/gdnsd-$pkgver prepare() { @@ -33,6 +34,8 @@ build() { --enable-fast-install \ || return 1 make || return 1 + install -Dm755 "$srcdir"/gdnsd.initd "$pkgdir"/etc/init.d/gdnsd \ + || return 1 } package() { @@ -42,4 +45,5 @@ package() { "$pkgdir"/usr/lib/gdnsd/*.la } -md5sums="082f874d24cdc7073950ed6294f8d39b gdnsd-1.6.2.tar.xz" +md5sums="082f874d24cdc7073950ed6294f8d39b gdnsd-1.6.2.tar.xz +dad20779adfb4b85b57b45c7c903a636 gdnsd.initd" diff --git a/testing/gdnsd/gdnsd.initd b/testing/gdnsd/gdnsd.initd new file mode 100755 index 0000000000..e11a73d1d6 --- /dev/null +++ b/testing/gdnsd/gdnsd.initd @@ -0,0 +1,18 @@ +#!/sbin/runscript + +depend() { + need net + after firewall +} + +start() { + ebegin "Starting dnsd" + start-stop-daemon --start --exec /usr/sbin/dnsd -- -d $DNSD_OPTS + eend $? +} + +stop () { + ebegin "Stopping dnsd" + start-stop-daemon --stop --exec /usr/sbin/dnsd + eend $? +} diff --git a/testing/hdparm/APKBUILD b/testing/hdparm/APKBUILD deleted file mode 100644 index c3d24ed7a0..0000000000 --- a/testing/hdparm/APKBUILD +++ /dev/null @@ -1,39 +0,0 @@ -# Contributor: William Pitcock <nenolod@dereferenced.org> -# Maintainer: -pkgname=hdparm -pkgver=9.37 -pkgrel=0 -pkgdesc="hard drive parameter setting and benchmarking tool" -url="http://sourceforge.net/projects/hdparm" -arch="all" -license="BSD" -depends="" -depends_dev="" -makedepends="$depends_dev" -install="" -subpackages="$pkgname-doc" -source="http://sourceforge.net/projects/hdparm/files/hdparm/hdparm-$pkgver.tar.gz" - -_builddir="$srcdir"/hdparm-$pkgver -prepare() { - local i - cd "$_builddir" - for i in $source; do - case $i in - *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;; - esac - done -} - -build() { - cd "$_builddir" - make || return 1 -} - -package() { - cd "$_builddir" - make DESTDIR="$pkgdir" install || return 1 - rm -f "$pkgdir"/usr/lib/*.la -} - -md5sums="0bb94ddd1bedd5c02b1ca62f1caaf6de hdparm-9.37.tar.gz" diff --git a/testing/iproute2/0001-xfrm-mark.patch b/testing/iproute2/0001-xfrm-mark.patch deleted file mode 100644 index 9d8f1bfac6..0000000000 --- a/testing/iproute2/0001-xfrm-mark.patch +++ /dev/null @@ -1,401 +0,0 @@ -From d7cdb7750c80071fd2176d9e2c78e2e5052a2ac7 Mon Sep 17 00:00:00 2001 -From: Natanael Copa <ncopa@alpinelinux.org> -Date: Tue, 23 Feb 2010 16:08:17 +0000 -Subject: [PATCH] xfrm mark - ---- - include/linux/xfrm.h | 6 ++++ - ip/ipxfrm.c | 40 +++++++++++++++++++++++++++ - ip/xfrm.h | 1 + - ip/xfrm_policy.c | 38 ++++++++++++++++++++++++- - ip/xfrm_state.c | 74 ++++++++++++++++++++++++++++++++++++++++--------- - 5 files changed, 143 insertions(+), 16 deletions(-) - -diff --git a/include/linux/xfrm.h b/include/linux/xfrm.h -index a59bc4a..5cc2dd2 100644 ---- a/include/linux/xfrm.h -+++ b/include/linux/xfrm.h -@@ -283,11 +283,17 @@ enum xfrm_attr_type_t { - XFRMA_MIGRATE, - XFRMA_ALG_AEAD, /* struct xfrm_algo_aead */ - XFRMA_KMADDRESS, /* struct xfrm_user_kmaddress */ -+ XFRMA_MARK, - __XFRMA_MAX - - #define XFRMA_MAX (__XFRMA_MAX - 1) - }; - -+struct xfrm_umark { -+ __u32 v; /* value */ -+ __u32 m; /* mask */ -+}; -+ - enum xfrm_sadattr_type_t { - XFRMA_SAD_UNSPEC, - XFRMA_SAD_CNT, -diff --git a/ip/ipxfrm.c b/ip/ipxfrm.c -index 18250de..8250ec1 100644 ---- a/ip/ipxfrm.c -+++ b/ip/ipxfrm.c -@@ -629,9 +629,48 @@ static void xfrm_tmpl_print(struct xfrm_user_tmpl *tmpls, int len, - } - } - -+int xfrm_parse_mark(struct xfrm_umark *mark, int *argcp, char ***argvp) -+{ -+ int argc = *argcp; -+ char **argv = *argvp; -+ -+ NEXT_ARG(); -+ if (get_u32(&mark->v, *argv, 0)) { -+ invarg("Illegal \"mark\" value\n", *argv); -+ } -+ if (argc > 1) -+ NEXT_ARG(); -+ else { /* last entry on parse line */ -+ mark->m = 0xffffffff; -+ goto done; -+ } -+ -+ if (strcmp(*argv, "mask") == 0) { -+ NEXT_ARG(); -+ if (get_u32(&mark->m, *argv, 0)) { -+ invarg("Illegal \"mark\" mask\n", *argv); -+ } -+ } else { -+ mark->m = 0xffffffff; -+ PREV_ARG(); -+ } -+ -+done: -+ *argcp = argc; -+ *argvp = argv; -+ -+ return 0; -+} -+ - void xfrm_xfrma_print(struct rtattr *tb[], __u16 family, - FILE *fp, const char *prefix) - { -+ if (tb[XFRMA_MARK]) { -+ struct rtattr *rta = tb[XFRMA_MARK]; -+ struct xfrm_umark *m = (struct xfrm_umark *) RTA_DATA(rta); -+ fprintf(fp, "\tmark %d/0x%x\n", m->v, m->m); -+ } -+ - if (tb[XFRMA_ALG_AUTH]) { - struct rtattr *rta = tb[XFRMA_ALG_AUTH]; - xfrm_algo_print((struct xfrm_algo *) RTA_DATA(rta), -@@ -740,6 +779,7 @@ void xfrm_xfrma_print(struct rtattr *tb[], __u16 family, - fprintf(fp, "%s", strxf_time(lastused)); - fprintf(fp, "%s", _SL_); - } -+ - } - - static int xfrm_selector_iszero(struct xfrm_selector *s) -diff --git a/ip/xfrm.h b/ip/xfrm.h -index 104fb20..ab03b19 100644 ---- a/ip/xfrm.h -+++ b/ip/xfrm.h -@@ -121,6 +121,7 @@ int xfrm_xfrmproto_is_ipsec(__u8 proto); - int xfrm_xfrmproto_is_ro(__u8 proto); - int xfrm_xfrmproto_getbyname(char *name); - int xfrm_algotype_getbyname(char *name); -+int xfrm_parse_mark(struct xfrm_umark *mark, int *argcp, char ***argvp); - const char *strxf_xfrmproto(__u8 proto); - const char *strxf_algotype(int type); - const char *strxf_mask8(__u8 mask); -diff --git a/ip/xfrm_policy.c b/ip/xfrm_policy.c -index 11116e5..5b5bafa 100644 ---- a/ip/xfrm_policy.c -+++ b/ip/xfrm_policy.c -@@ -54,8 +54,8 @@ static void usage(void) __attribute__((noreturn)); - static void usage(void) - { - fprintf(stderr, "Usage: ip xfrm policy { add | update } dir DIR SELECTOR [ index INDEX ] [ ptype PTYPE ]\n"); -- fprintf(stderr, " [ action ACTION ] [ priority PRIORITY ] [ flag FLAG-LIST ] [ LIMIT-LIST ] [ TMPL-LIST ]\n"); -- fprintf(stderr, "Usage: ip xfrm policy { delete | get } dir DIR [ SELECTOR | index INDEX ] [ ptype PTYPE ]\n"); -+ fprintf(stderr, " [ action ACTION ] [ priority PRIORITY ] [ flag FLAG-LIST ] [ LIMIT-LIST ] [ TMPL-LIST ] [mark MARK [mask MASK]]\n"); -+ fprintf(stderr, "Usage: ip xfrm policy { delete | get } dir DIR [ SELECTOR | index INDEX ] [ ptype PTYPE ] [mark MARK [mask MASK]]\n"); - fprintf(stderr, "Usage: ip xfrm policy { deleteall | list } [ dir DIR ] [ SELECTOR ]\n"); - fprintf(stderr, " [ index INDEX ] [ action ACTION ] [ priority PRIORITY ] [ flag FLAG-LIST ]\n"); - fprintf(stderr, "Usage: ip xfrm policy flush [ ptype PTYPE ]\n"); -@@ -235,6 +235,7 @@ static int xfrm_policy_modify(int cmd, unsigned flags, int argc, char **argv) - struct xfrm_userpolicy_type upt; - char tmpls_buf[XFRM_TMPLS_BUF_SIZE]; - int tmpls_len = 0; -+ struct xfrm_umark mark = {0, 0}; - - memset(&req, 0, sizeof(req)); - memset(&upt, 0, sizeof(upt)); -@@ -258,6 +259,8 @@ static int xfrm_policy_modify(int cmd, unsigned flags, int argc, char **argv) - - NEXT_ARG(); - xfrm_policy_dir_parse(&req.xpinfo.dir, &argc, &argv); -+ } else if (strcmp(*argv, "mark") == 0) { -+ xfrm_parse_mark(&mark, &argc, &argv); - } else if (strcmp(*argv, "index") == 0) { - NEXT_ARG(); - if (get_u32(&req.xpinfo.index, *argv, 0)) -@@ -334,6 +337,16 @@ static int xfrm_policy_modify(int cmd, unsigned flags, int argc, char **argv) - (void *)tmpls_buf, tmpls_len); - } - -+ if (mark.m & mark.v) { -+ int r = addattr_l(&req.n, sizeof(req.buf), XFRMA_MARK, -+ (void *)&mark, sizeof(mark)); -+ if (r < 0) { -+ fprintf(stderr, "%s: XFRMA_MARK failed\n",__func__); -+ exit(1); -+ } -+ } -+ -+ - if (rtnl_open_byproto(&rth, 0, NETLINK_XFRM) < 0) - exit(1); - -@@ -515,6 +528,7 @@ static int xfrm_policy_get_or_delete(int argc, char **argv, int delete, - char *indexp = NULL; - char *ptypep = NULL; - struct xfrm_userpolicy_type upt; -+ struct xfrm_umark mark = {0, 0}; - - memset(&req, 0, sizeof(req)); - memset(&upt, 0, sizeof(upt)); -@@ -532,6 +546,8 @@ static int xfrm_policy_get_or_delete(int argc, char **argv, int delete, - NEXT_ARG(); - xfrm_policy_dir_parse(&req.xpid.dir, &argc, &argv); - -+ } else if (strcmp(*argv, "mark") == 0) { -+ xfrm_parse_mark(&mark, &argc, &argv); - } else if (strcmp(*argv, "index") == 0) { - if (indexp) - duparg("index", *argv); -@@ -584,6 +600,15 @@ static int xfrm_policy_get_or_delete(int argc, char **argv, int delete, - if (req.xpid.sel.family == AF_UNSPEC) - req.xpid.sel.family = AF_INET; - -+ if (mark.m & mark.v) { -+ int r = addattr_l(&req.n, sizeof(req.buf), XFRMA_MARK, -+ (void *)&mark, sizeof(mark)); -+ if (r < 0) { -+ fprintf(stderr, "%s: XFRMA_MARK failed\n",__func__); -+ exit(1); -+ } -+ } -+ - if (rtnl_talk(&rth, &req.n, 0, 0, res_nlbuf, NULL, NULL) < 0) - exit(2); - -@@ -951,26 +976,35 @@ static int xfrm_policy_flush(int argc, char **argv) - - int do_xfrm_policy(int argc, char **argv) - { -+//Needs testing .. - if (argc < 1) - return xfrm_policy_list_or_deleteall(0, NULL, 0); - -+//should work - if (matches(*argv, "add") == 0) - return xfrm_policy_modify(XFRM_MSG_NEWPOLICY, 0, - argc-1, argv+1); -+//should work - if (matches(*argv, "update") == 0) - return xfrm_policy_modify(XFRM_MSG_UPDPOLICY, 0, - argc-1, argv+1); -+//should work - if (matches(*argv, "delete") == 0) - return xfrm_policy_delete(argc-1, argv+1); -+//Needs fixing .. - if (matches(*argv, "deleteall") == 0 || matches(*argv, "delall") == 0) - return xfrm_policy_list_or_deleteall(argc-1, argv+1, 1); -+//should work - if (matches(*argv, "list") == 0 || matches(*argv, "show") == 0 - || matches(*argv, "lst") == 0) - return xfrm_policy_list_or_deleteall(argc-1, argv+1, 0); -+//should work - if (matches(*argv, "get") == 0) - return xfrm_policy_get(argc-1, argv+1); -+//should work - if (matches(*argv, "flush") == 0) - return xfrm_policy_flush(argc-1, argv+1); -+//should work - if (matches(*argv, "count") == 0) - return xfrm_spd_getinfo(argc, argv); - if (matches(*argv, "help") == 0) -diff --git a/ip/xfrm_state.c b/ip/xfrm_state.c -index b1e3f22..d645c18 100644 ---- a/ip/xfrm_state.c -+++ b/ip/xfrm_state.c -@@ -67,7 +67,7 @@ static void usage(void) - fprintf(stderr, "Usage: ip xfrm state flush [ proto XFRM_PROTO ]\n"); - fprintf(stderr, "Usage: ip xfrm state count \n"); - -- fprintf(stderr, "ID := [ src ADDR ] [ dst ADDR ] [ proto XFRM_PROTO ] [ spi SPI ]\n"); -+ fprintf(stderr, "ID := [ src ADDR ] [ dst ADDR ] [ proto XFRM_PROTO ] [ spi SPI ] [mark MARK [mask MASK]]\n"); - //fprintf(stderr, "XFRM_PROTO := [ esp | ah | comp ]\n"); - fprintf(stderr, "XFRM_PROTO := [ "); - fprintf(stderr, "%s | ", strxf_xfrmproto(IPPROTO_ESP)); -@@ -242,6 +242,7 @@ static int xfrm_state_modify(int cmd, unsigned flags, int argc, char **argv) - char *aalgop = NULL; - char *calgop = NULL; - char *coap = NULL; -+ struct xfrm_umark mark = {0, 0}; - - memset(&req, 0, sizeof(req)); - memset(&replay, 0, sizeof(replay)); -@@ -260,6 +261,8 @@ static int xfrm_state_modify(int cmd, unsigned flags, int argc, char **argv) - if (strcmp(*argv, "mode") == 0) { - NEXT_ARG(); - xfrm_mode_parse(&req.xsinfo.mode, &argc, &argv); -+ } else if (strcmp(*argv, "mark") == 0) { -+ xfrm_parse_mark(&mark, &argc, &argv); - } else if (strcmp(*argv, "reqid") == 0) { - NEXT_ARG(); - xfrm_reqid_parse(&req.xsinfo.reqid, &argc, &argv); -@@ -436,6 +439,15 @@ parse_algo: - exit(1); - } - -+ if (mark.m & mark.v) { -+ int r = addattr_l(&req.n, sizeof(req.buf), XFRMA_MARK, -+ (void *)&mark, sizeof(mark)); -+ if (r < 0) { -+ fprintf(stderr, "XFRMA_MARK failed\n"); -+ exit(1); -+ } -+ } -+ - switch (req.xsinfo.mode) { - case XFRM_MODE_TRANSPORT: - case XFRM_MODE_TUNNEL: -@@ -515,6 +527,7 @@ static int xfrm_state_allocspi(int argc, char **argv) - char *idp = NULL; - char *minp = NULL; - char *maxp = NULL; -+ struct xfrm_umark mark = {0, 0}; - char res_buf[NLMSG_BUF_SIZE]; - struct nlmsghdr *res_n = (struct nlmsghdr *)res_buf; - -@@ -538,6 +551,8 @@ static int xfrm_state_allocspi(int argc, char **argv) - if (strcmp(*argv, "mode") == 0) { - NEXT_ARG(); - xfrm_mode_parse(&req.xspi.info.mode, &argc, &argv); -+ } else if (strcmp(*argv, "mark") == 0) { -+ xfrm_parse_mark(&mark, &argc, &argv); - } else if (strcmp(*argv, "reqid") == 0) { - NEXT_ARG(); - xfrm_reqid_parse(&req.xspi.info.reqid, &argc, &argv); -@@ -614,6 +629,15 @@ static int xfrm_state_allocspi(int argc, char **argv) - req.xspi.max = 0xffff; - } - -+ if (mark.m & mark.v) { -+ int r = addattr_l(&req.n, sizeof(req.buf), XFRMA_MARK, -+ (void *)&mark, sizeof(mark)); -+ if (r < 0) { -+ fprintf(stderr, "XFRMA_MARK failed\n"); -+ exit(1); -+ } -+ } -+ - if (rtnl_open_byproto(&rth, 0, NETLINK_XFRM) < 0) - exit(1); - -@@ -759,6 +783,7 @@ static int xfrm_state_get_or_delete(int argc, char **argv, int delete) - } req; - struct xfrm_id id; - char *idp = NULL; -+ struct xfrm_umark mark = {0, 0}; - - memset(&req, 0, sizeof(req)); - -@@ -770,26 +795,39 @@ static int xfrm_state_get_or_delete(int argc, char **argv, int delete) - while (argc > 0) { - xfrm_address_t saddr; - -- if (idp) -- invarg("unknown", *argv); -- idp = *argv; -+ if (strcmp(*argv, "mark") == 0) { -+ xfrm_parse_mark(&mark, &argc, &argv); -+ } else { -+ if (idp) -+ invarg("unknown", *argv); -+ idp = *argv; - -- /* ID */ -- memset(&id, 0, sizeof(id)); -- memset(&saddr, 0, sizeof(saddr)); -- xfrm_id_parse(&saddr, &id, &req.xsid.family, 0, -- &argc, &argv); -+ /* ID */ -+ memset(&id, 0, sizeof(id)); -+ memset(&saddr, 0, sizeof(saddr)); -+ xfrm_id_parse(&saddr, &id, &req.xsid.family, 0, -+ &argc, &argv); - -- memcpy(&req.xsid.daddr, &id.daddr, sizeof(req.xsid.daddr)); -- req.xsid.spi = id.spi; -- req.xsid.proto = id.proto; -+ memcpy(&req.xsid.daddr, &id.daddr, sizeof(req.xsid.daddr)); -+ req.xsid.spi = id.spi; -+ req.xsid.proto = id.proto; - -- addattr_l(&req.n, sizeof(req.buf), XFRMA_SRCADDR, -- (void *)&saddr, sizeof(saddr)); -+ addattr_l(&req.n, sizeof(req.buf), XFRMA_SRCADDR, -+ (void *)&saddr, sizeof(saddr)); -+ } - - argc--; argv++; - } - -+ if (mark.m & mark.v) { -+ int r = addattr_l(&req.n, sizeof(req.buf), XFRMA_MARK, -+ (void *)&mark, sizeof(mark)); -+ if (r < 0) { -+ fprintf(stderr, "XFRMA_MARK failed\n"); -+ exit(1); -+ } -+ } -+ - if (rtnl_open_byproto(&rth, 0, NETLINK_XFRM) < 0) - exit(1); - -@@ -1113,23 +1151,31 @@ int do_xfrm_state(int argc, char **argv) - if (argc < 1) - return xfrm_state_list_or_deleteall(0, NULL, 0); - -+ //XXX: should work - if (matches(*argv, "add") == 0) - return xfrm_state_modify(XFRM_MSG_NEWSA, 0, - argc-1, argv+1); -+ //XXX: should work - if (matches(*argv, "update") == 0) - return xfrm_state_modify(XFRM_MSG_UPDSA, 0, - argc-1, argv+1); -+ //XXX: should work - if (matches(*argv, "allocspi") == 0) - return xfrm_state_allocspi(argc-1, argv+1); -+ //XXX: should work - if (matches(*argv, "delete") == 0) - return xfrm_state_get_or_delete(argc-1, argv+1, 1); -+ //XXX: needs testing .. - if (matches(*argv, "deleteall") == 0 || matches(*argv, "delall") == 0) - return xfrm_state_list_or_deleteall(argc-1, argv+1, 1); -+ //XXX: should work - if (matches(*argv, "list") == 0 || matches(*argv, "show") == 0 - || matches(*argv, "lst") == 0) - return xfrm_state_list_or_deleteall(argc-1, argv+1, 0); -+ //XXX: should work - if (matches(*argv, "get") == 0) - return xfrm_state_get_or_delete(argc-1, argv+1, 0); -+ //XXX: should work - if (matches(*argv, "flush") == 0) - return xfrm_state_flush(argc-1, argv+1); - if (matches(*argv, "count") == 0) { --- -1.6.6.1 - diff --git a/testing/iproute2/2.patch b/testing/iproute2/2.patch deleted file mode 100644 index 57621bc654..0000000000 --- a/testing/iproute2/2.patch +++ /dev/null @@ -1,363 +0,0 @@ -diff --git a/ip/ipxfrm.c b/ip/ipxfrm.c -index 7dc36f3..0aaf97a 100644 ---- a/ip/ipxfrm.c -+++ b/ip/ipxfrm.c -@@ -629,9 +629,48 @@ static void xfrm_tmpl_print(struct xfrm_user_tmpl *tmpls, int len, - } - } - -+int xfrm_parse_mark(struct xfrm_umark *mark, int *argcp, char ***argvp) -+{ -+ int argc = *argcp; -+ char **argv = *argvp; -+ -+ NEXT_ARG(); -+ if (get_u32(&mark->v, *argv, 0)) { -+ invarg("Illegal \"mark\" value\n", *argv); -+ } -+ if (argc > 1) -+ NEXT_ARG(); -+ else { /* last entry on parse line */ -+ mark->m = 0xffffffff; -+ goto done; -+ } -+ -+ if (strcmp(*argv, "mask") == 0) { -+ NEXT_ARG(); -+ if (get_u32(&mark->m, *argv, 0)) { -+ invarg("Illegal \"mark\" mask\n", *argv); -+ } -+ } else { -+ mark->m = 0xffffffff; -+ PREV_ARG(); -+ } -+ -+done: -+ *argcp = argc; -+ *argvp = argv; -+ -+ return 0; -+} -+ - void xfrm_xfrma_print(struct rtattr *tb[], __u16 family, - FILE *fp, const char *prefix) - { -+ if (tb[XFRMA_MARK]) { -+ struct rtattr *rta = tb[XFRMA_MARK]; -+ struct xfrm_umark *m = (struct xfrm_umark *) RTA_DATA(rta); -+ fprintf(fp, "\tmark %d/0x%x\n", m->v, m->m); -+ } -+ - if (tb[XFRMA_ALG_AUTH]) { - struct rtattr *rta = tb[XFRMA_ALG_AUTH]; - xfrm_algo_print((struct xfrm_algo *) RTA_DATA(rta), -@@ -740,6 +779,7 @@ void xfrm_xfrma_print(struct rtattr *tb[], __u16 family, - fprintf(fp, "%s", strxf_time(lastused)); - fprintf(fp, "%s", _SL_); - } -+ - } - - static int xfrm_selector_iszero(struct xfrm_selector *s) -diff --git a/ip/xfrm.h b/ip/xfrm.h -index 104fb20..ab03b19 100644 ---- a/ip/xfrm.h -+++ b/ip/xfrm.h -@@ -121,6 +121,7 @@ int xfrm_xfrmproto_is_ipsec(__u8 proto); - int xfrm_xfrmproto_is_ro(__u8 proto); - int xfrm_xfrmproto_getbyname(char *name); - int xfrm_algotype_getbyname(char *name); -+int xfrm_parse_mark(struct xfrm_umark *mark, int *argcp, char ***argvp); - const char *strxf_xfrmproto(__u8 proto); - const char *strxf_algotype(int type); - const char *strxf_mask8(__u8 mask); -diff --git a/ip/xfrm_policy.c b/ip/xfrm_policy.c -index 2788477..7cdf0b6 100644 ---- a/ip/xfrm_policy.c -+++ b/ip/xfrm_policy.c -@@ -54,8 +54,8 @@ static void usage(void) __attribute__((noreturn)); - static void usage(void) - { - fprintf(stderr, "Usage: ip xfrm policy { add | update } dir DIR SELECTOR [ index INDEX ] [ ptype PTYPE ]\n"); -- fprintf(stderr, " [ action ACTION ] [ priority PRIORITY ] [ flag FLAG-LIST ] [ LIMIT-LIST ] [ TMPL-LIST ]\n"); -- fprintf(stderr, "Usage: ip xfrm policy { delete | get } dir DIR [ SELECTOR | index INDEX ] [ ptype PTYPE ]\n"); -+ fprintf(stderr, " [ action ACTION ] [ priority PRIORITY ] [ flag FLAG-LIST ] [ LIMIT-LIST ] [ TMPL-LIST ] [mark MARK [mask MASK]]\n"); -+ fprintf(stderr, "Usage: ip xfrm policy { delete | get } dir DIR [ SELECTOR | index INDEX ] [ ptype PTYPE ] [mark MARK [mask MASK]]\n"); - fprintf(stderr, "Usage: ip xfrm policy { deleteall | list } [ dir DIR ] [ SELECTOR ]\n"); - fprintf(stderr, " [ index INDEX ] [ action ACTION ] [ priority PRIORITY ] [ flag FLAG-LIST ]\n"); - fprintf(stderr, "Usage: ip xfrm policy flush [ ptype PTYPE ]\n"); -@@ -235,6 +235,7 @@ static int xfrm_policy_modify(int cmd, unsigned flags, int argc, char **argv) - struct xfrm_userpolicy_type upt; - char tmpls_buf[XFRM_TMPLS_BUF_SIZE]; - int tmpls_len = 0; -+ struct xfrm_umark mark = {0, 0}; - - memset(&req, 0, sizeof(req)); - memset(&upt, 0, sizeof(upt)); -@@ -258,6 +259,8 @@ static int xfrm_policy_modify(int cmd, unsigned flags, int argc, char **argv) - - NEXT_ARG(); - xfrm_policy_dir_parse(&req.xpinfo.dir, &argc, &argv); -+ } else if (strcmp(*argv, "mark") == 0) { -+ xfrm_parse_mark(&mark, &argc, &argv); - } else if (strcmp(*argv, "index") == 0) { - NEXT_ARG(); - if (get_u32(&req.xpinfo.index, *argv, 0)) -@@ -334,6 +337,16 @@ static int xfrm_policy_modify(int cmd, unsigned flags, int argc, char **argv) - (void *)tmpls_buf, tmpls_len); - } - -+ if (mark.m & mark.v) { -+ int r = addattr_l(&req.n, sizeof(req.buf), XFRMA_MARK, -+ (void *)&mark, sizeof(mark)); -+ if (r < 0) { -+ fprintf(stderr, "%s: XFRMA_MARK failed\n",__func__); -+ exit(1); -+ } -+ } -+ -+ - if (rtnl_open_byproto(&rth, 0, NETLINK_XFRM) < 0) - exit(1); - -@@ -515,6 +528,7 @@ static int xfrm_policy_get_or_delete(int argc, char **argv, int delete, - char *indexp = NULL; - char *ptypep = NULL; - struct xfrm_userpolicy_type upt; -+ struct xfrm_umark mark = {0, 0}; - - memset(&req, 0, sizeof(req)); - memset(&upt, 0, sizeof(upt)); -@@ -532,6 +546,8 @@ static int xfrm_policy_get_or_delete(int argc, char **argv, int delete, - NEXT_ARG(); - xfrm_policy_dir_parse(&req.xpid.dir, &argc, &argv); - -+ } else if (strcmp(*argv, "mark") == 0) { -+ xfrm_parse_mark(&mark, &argc, &argv); - } else if (strcmp(*argv, "index") == 0) { - if (indexp) - duparg("index", *argv); -@@ -584,6 +600,15 @@ static int xfrm_policy_get_or_delete(int argc, char **argv, int delete, - if (req.xpid.sel.family == AF_UNSPEC) - req.xpid.sel.family = AF_INET; - -+ if (mark.m & mark.v) { -+ int r = addattr_l(&req.n, sizeof(req.buf), XFRMA_MARK, -+ (void *)&mark, sizeof(mark)); -+ if (r < 0) { -+ fprintf(stderr, "%s: XFRMA_MARK failed\n",__func__); -+ exit(1); -+ } -+ } -+ - if (rtnl_talk(&rth, &req.n, 0, 0, res_nlbuf, NULL, NULL) < 0) - exit(2); - -@@ -951,26 +976,35 @@ static int xfrm_policy_flush(int argc, char **argv) - - int do_xfrm_policy(int argc, char **argv) - { -+//Needs testing .. - if (argc < 1) - return xfrm_policy_list_or_deleteall(0, NULL, 0); - -+//should work - if (matches(*argv, "add") == 0) - return xfrm_policy_modify(XFRM_MSG_NEWPOLICY, 0, - argc-1, argv+1); -+//should work - if (matches(*argv, "update") == 0) - return xfrm_policy_modify(XFRM_MSG_UPDPOLICY, 0, - argc-1, argv+1); -+//should work - if (matches(*argv, "delete") == 0) - return xfrm_policy_delete(argc-1, argv+1); -+//Needs fixing .. - if (matches(*argv, "deleteall") == 0 || matches(*argv, "delall") == 0) - return xfrm_policy_list_or_deleteall(argc-1, argv+1, 1); -+//should work - if (matches(*argv, "list") == 0 || matches(*argv, "show") == 0 - || matches(*argv, "lst") == 0) - return xfrm_policy_list_or_deleteall(argc-1, argv+1, 0); -+//should work - if (matches(*argv, "get") == 0) - return xfrm_policy_get(argc-1, argv+1); -+//should work - if (matches(*argv, "flush") == 0) - return xfrm_policy_flush(argc-1, argv+1); -+//should work - if (matches(*argv, "count") == 0) - return xfrm_spd_getinfo(argc, argv); - if (matches(*argv, "help") == 0) -diff --git a/ip/xfrm_state.c b/ip/xfrm_state.c -index 32238ab..4255d25 100644 ---- a/ip/xfrm_state.c -+++ b/ip/xfrm_state.c -@@ -67,7 +67,7 @@ static void usage(void) - fprintf(stderr, "Usage: ip xfrm state flush [ proto XFRM_PROTO ]\n"); - fprintf(stderr, "Usage: ip xfrm state count \n"); - -- fprintf(stderr, "ID := [ src ADDR ] [ dst ADDR ] [ proto XFRM_PROTO ] [ spi SPI ]\n"); -+ fprintf(stderr, "ID := [ src ADDR ] [ dst ADDR ] [ proto XFRM_PROTO ] [ spi SPI ] [mark MARK [mask MASK]]\n"); - //fprintf(stderr, "XFRM_PROTO := [ esp | ah | comp ]\n"); - fprintf(stderr, "XFRM_PROTO := [ "); - fprintf(stderr, "%s | ", strxf_xfrmproto(IPPROTO_ESP)); -@@ -246,6 +246,7 @@ static int xfrm_state_modify(int cmd, unsigned flags, int argc, char **argv) - char *aalgop = NULL; - char *calgop = NULL; - char *coap = NULL; -+ struct xfrm_umark mark = {0, 0}; - - memset(&req, 0, sizeof(req)); - memset(&replay, 0, sizeof(replay)); -@@ -264,6 +265,8 @@ static int xfrm_state_modify(int cmd, unsigned flags, int argc, char **argv) - if (strcmp(*argv, "mode") == 0) { - NEXT_ARG(); - xfrm_mode_parse(&req.xsinfo.mode, &argc, &argv); -+ } else if (strcmp(*argv, "mark") == 0) { -+ xfrm_parse_mark(&mark, &argc, &argv); - } else if (strcmp(*argv, "reqid") == 0) { - NEXT_ARG(); - xfrm_reqid_parse(&req.xsinfo.reqid, &argc, &argv); -@@ -440,6 +443,15 @@ parse_algo: - exit(1); - } - -+ if (mark.m & mark.v) { -+ int r = addattr_l(&req.n, sizeof(req.buf), XFRMA_MARK, -+ (void *)&mark, sizeof(mark)); -+ if (r < 0) { -+ fprintf(stderr, "XFRMA_MARK failed\n"); -+ exit(1); -+ } -+ } -+ - switch (req.xsinfo.mode) { - case XFRM_MODE_TRANSPORT: - case XFRM_MODE_TUNNEL: -@@ -519,6 +531,7 @@ static int xfrm_state_allocspi(int argc, char **argv) - char *idp = NULL; - char *minp = NULL; - char *maxp = NULL; -+ struct xfrm_umark mark = {0, 0}; - char res_buf[NLMSG_BUF_SIZE]; - struct nlmsghdr *res_n = (struct nlmsghdr *)res_buf; - -@@ -542,6 +555,8 @@ static int xfrm_state_allocspi(int argc, char **argv) - if (strcmp(*argv, "mode") == 0) { - NEXT_ARG(); - xfrm_mode_parse(&req.xspi.info.mode, &argc, &argv); -+ } else if (strcmp(*argv, "mark") == 0) { -+ xfrm_parse_mark(&mark, &argc, &argv); - } else if (strcmp(*argv, "reqid") == 0) { - NEXT_ARG(); - xfrm_reqid_parse(&req.xspi.info.reqid, &argc, &argv); -@@ -618,6 +633,15 @@ static int xfrm_state_allocspi(int argc, char **argv) - req.xspi.max = 0xffff; - } - -+ if (mark.m & mark.v) { -+ int r = addattr_l(&req.n, sizeof(req.buf), XFRMA_MARK, -+ (void *)&mark, sizeof(mark)); -+ if (r < 0) { -+ fprintf(stderr, "XFRMA_MARK failed\n"); -+ exit(1); -+ } -+ } -+ - if (rtnl_open_byproto(&rth, 0, NETLINK_XFRM) < 0) - exit(1); - -@@ -763,6 +787,7 @@ static int xfrm_state_get_or_delete(int argc, char **argv, int delete) - } req; - struct xfrm_id id; - char *idp = NULL; -+ struct xfrm_umark mark = {0, 0}; - - memset(&req, 0, sizeof(req)); - -@@ -774,26 +799,39 @@ static int xfrm_state_get_or_delete(int argc, char **argv, int delete) - while (argc > 0) { - xfrm_address_t saddr; - -- if (idp) -- invarg("unknown", *argv); -- idp = *argv; -+ if (strcmp(*argv, "mark") == 0) { -+ xfrm_parse_mark(&mark, &argc, &argv); -+ } else { -+ if (idp) -+ invarg("unknown", *argv); -+ idp = *argv; - -- /* ID */ -- memset(&id, 0, sizeof(id)); -- memset(&saddr, 0, sizeof(saddr)); -- xfrm_id_parse(&saddr, &id, &req.xsid.family, 0, -- &argc, &argv); -+ /* ID */ -+ memset(&id, 0, sizeof(id)); -+ memset(&saddr, 0, sizeof(saddr)); -+ xfrm_id_parse(&saddr, &id, &req.xsid.family, 0, -+ &argc, &argv); - -- memcpy(&req.xsid.daddr, &id.daddr, sizeof(req.xsid.daddr)); -- req.xsid.spi = id.spi; -- req.xsid.proto = id.proto; -+ memcpy(&req.xsid.daddr, &id.daddr, sizeof(req.xsid.daddr)); -+ req.xsid.spi = id.spi; -+ req.xsid.proto = id.proto; - -- addattr_l(&req.n, sizeof(req.buf), XFRMA_SRCADDR, -- (void *)&saddr, sizeof(saddr)); -+ addattr_l(&req.n, sizeof(req.buf), XFRMA_SRCADDR, -+ (void *)&saddr, sizeof(saddr)); -+ } - - argc--; argv++; - } - -+ if (mark.m & mark.v) { -+ int r = addattr_l(&req.n, sizeof(req.buf), XFRMA_MARK, -+ (void *)&mark, sizeof(mark)); -+ if (r < 0) { -+ fprintf(stderr, "XFRMA_MARK failed\n"); -+ exit(1); -+ } -+ } -+ - if (rtnl_open_byproto(&rth, 0, NETLINK_XFRM) < 0) - exit(1); - -@@ -1117,23 +1155,31 @@ int do_xfrm_state(int argc, char **argv) - if (argc < 1) - return xfrm_state_list_or_deleteall(0, NULL, 0); - -+ //XXX: should work - if (matches(*argv, "add") == 0) - return xfrm_state_modify(XFRM_MSG_NEWSA, 0, - argc-1, argv+1); -+ //XXX: should work - if (matches(*argv, "update") == 0) - return xfrm_state_modify(XFRM_MSG_UPDSA, 0, - argc-1, argv+1); -+ //XXX: should work - if (matches(*argv, "allocspi") == 0) - return xfrm_state_allocspi(argc-1, argv+1); -+ //XXX: should work - if (matches(*argv, "delete") == 0) - return xfrm_state_get_or_delete(argc-1, argv+1, 1); -+ //XXX: needs testing .. - if (matches(*argv, "deleteall") == 0 || matches(*argv, "delall") == 0) - return xfrm_state_list_or_deleteall(argc-1, argv+1, 1); -+ //XXX: should work - if (matches(*argv, "list") == 0 || matches(*argv, "show") == 0 - || matches(*argv, "lst") == 0) - return xfrm_state_list_or_deleteall(argc-1, argv+1, 0); -+ //XXX: should work - if (matches(*argv, "get") == 0) - return xfrm_state_get_or_delete(argc-1, argv+1, 0); -+ //XXX: should work - if (matches(*argv, "flush") == 0) - return xfrm_state_flush(argc-1, argv+1); - if (matches(*argv, "count") == 0) { diff --git a/testing/iproute2/APKBUILD b/testing/iproute2/APKBUILD deleted file mode 100644 index 42065e9802..0000000000 --- a/testing/iproute2/APKBUILD +++ /dev/null @@ -1,38 +0,0 @@ -# Maintainer: Natanael Copa <ncopa@alpinelinux.org> -pkgname=iproute2 -pkgver=2.6.31 -_realver=2.6.31 -pkgrel=1 -pkgdesc="IP Routing Utilities" -url="http://www.linux-foundation.org/en/Net:Iproute2" -arch="all" -license="GPL2" -depends= -install="$pkgname.post-install $pkgname.post-deinstall" -makedepends="bison flex bash" -subpackages="$pkgname-doc" -source="http://devresources.linux-foundation.org/dev/iproute2/download/$pkgname-$_realver.tar.bz2 - 0001-xfrm-mark.patch" - -prepare() { - cd "$srcdir"/$pkgname-$_realver - - patch -p1 -i "$srcdir"/0001-xfrm-mark.patch || return 1 - sed -i '/^TARGETS=/s: arpd : :' misc/Makefile - sed -i 's:/usr/local:/usr:' tc/m_ipt.c include/iptables.h || return 1 - sed -i 's:=/share:=/usr/share:' Makefile || return 1 -} - -build() { - cd "$srcdir"/$pkgname-$_realver - ./configure || return 1 - make CCOPTS="-D_GNU_SOURCE $CFLAGS" LIBDIR=/lib || return 1 -} - -package() { - cd "$srcdir"/$pkgname-$_realver - make -j1 DESTDIR="$pkgdir" install -} - -md5sums="230f35282a95451622f3e8394f9cd80a iproute2-2.6.31.tar.bz2 -f32fc320c0b5640d3f4d511d7c763f46 0001-xfrm-mark.patch" diff --git a/testing/iproute2/iproute2.post-deinstall b/testing/iproute2/iproute2.post-deinstall deleted file mode 100644 index dd117e5d80..0000000000 --- a/testing/iproute2/iproute2.post-deinstall +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh - -busybox --install -s - diff --git a/testing/iproute2/iproute2.post-install b/testing/iproute2/iproute2.post-install deleted file mode 100644 index 36d567ea21..0000000000 --- a/testing/iproute2/iproute2.post-install +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh - -if [ "$(readlink /bin/ip)" = "/bin/busybox" ]; then - rm -f /bin/ip -fi -exit 0 diff --git a/testing/makedepend/APKBUILD b/testing/makedepend/APKBUILD deleted file mode 100644 index 60252123ac..0000000000 --- a/testing/makedepend/APKBUILD +++ /dev/null @@ -1,40 +0,0 @@ -# Maintainer: Natanael Copa <ncopa@alpinelinux.org> -pkgname=makedepend -pkgver=1.0.3 -pkgrel=0 -pkgdesc="create dependencies in makefiles" -url="http://www.x.org" -arch="all" -license="MIT" -depends="" -depends_dev="" -makedepends="$depends_dev xproto" -install="" -subpackages="$pkgname-doc" -source="http://ftp.x.org/pub/individual/util/makedepend-$pkgver.tar.bz2" - -_builddir="$srcdir"/makedepend-$pkgver -prepare() { - local i - cd "$_builddir" - for i in $source; do - case $i in - *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;; - esac - done -} - -build() { - cd "$_builddir" - ./configure --prefix=/usr \ - || return 1 - make || return 1 -} - -package() { - cd "$_builddir" - make DESTDIR="$pkgdir" install || return 1 - rm -f "$pkgdir"/usr/lib/*.la -} - -md5sums="4e6cb97bbecfbb34f3f644a75e513093 makedepend-1.0.3.tar.bz2" diff --git a/testing/perl-io-stringy/APKBUILD b/testing/perl-io-stringy/APKBUILD deleted file mode 100644 index ebb0f7a9ce..0000000000 --- a/testing/perl-io-stringy/APKBUILD +++ /dev/null @@ -1,37 +0,0 @@ -# Automatically generated by apkbuild-cpan, template 1 -# Contributor: Francesco Colista <francesco.colista@gmail.com> -# Maintainer: Francesco Colista <francesco.colista@gmail.com> -pkgname=perl-io-stringy -_pkgreal=IO-stringy -pkgver=2.110 -pkgrel=0 -pkgdesc="unknown" -url="http://search.cpan.org/dist/IO-stringy/" -arch="noarch" -license="GPL PerlArtistic" -cpandepends="" -cpanmakedepends="" -depends="$cpandepends" -makedepends="perl-dev $cpanmakedepends" -subpackages="$pkgname-doc" -source="http://search.cpan.org/CPAN/authors/id/D/DS/DSKOLL/$_pkgreal-$pkgver.tar.gz" - -_builddir="$srcdir/$_pkgreal-$pkgver" - -prepare() { - cd "$_builddir" - PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor -} - -build() { - cd "$_builddir" - make && make test -} - -package() { - cd "$_builddir" - make DESTDIR="$pkgdir" install || return 1 - find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete -} - -md5sums="2e6a976cfa5521e815c1fdf4006982de IO-stringy-2.110.tar.gz" diff --git a/testing/perl-net-async-http/APKBUILD b/testing/perl-net-async-http/APKBUILD deleted file mode 100644 index bc2d2ec3ed..0000000000 --- a/testing/perl-net-async-http/APKBUILD +++ /dev/null @@ -1,39 +0,0 @@ -# Automatically generated by apkbuild-cpan, template 1 -# Contributor: Kiyoshi Aman <kiyoshi.aman@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman@gmail.com> -pkgname=perl-net-async-http -_pkgreal=Net-Async-HTTP -pkgver=0.16 -pkgrel=0 -pkgdesc="use HTTP with C<IO::Async>" -url="http://search.cpan.org/dist/Net-Async-HTTP/" -arch="noarch" -license="GPL PerlArtistic" -cpandepends="perl-uri perl-io-async perl-http-message" -cpanmakedepends="perl-http-cookies perl-test-identity perl-io-async " -depends="$cpandepends" -makedepends="perl-dev $cpanmakedepends" -subpackages="$pkgname-doc" -source="http://search.cpan.org/CPAN/authors/id/P/PE/PEVANS/$_pkgreal-$pkgver.tar.gz" - -_builddir="$srcdir/$_pkgreal-$pkgver" - -prepare() { - cd "$_builddir" - export CFLAGS=`perl -MConfig -E 'say $Config{ccflags}'` - perl Build.PL installdirs=vendor || return 1 -} - -build() { - cd "$_builddir" - export CFLAGS=`perl -MConfig -E 'say $Config{ccflags}'` - ./Build && ./Build test -} - -package() { - cd "$_builddir" - ./Build install destdir="$pkgdir" || return 1 - find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete -} - -md5sums="d1b430e4a04452368d61b8aa4bd5d2c0 Net-Async-HTTP-0.16.tar.gz" diff --git a/testing/perl-test-pod/APKBUILD b/testing/perl-test-pod/APKBUILD deleted file mode 100644 index 95a07af32a..0000000000 --- a/testing/perl-test-pod/APKBUILD +++ /dev/null @@ -1,38 +0,0 @@ -# Automatically generated by apkbuild-cpan, template 1 -# Contributor: Francesco Colista <francesco.colista@gmail.com> -# Maintainer: Francesco Colista <francesco.colista@gmail.com> -pkgname=perl-test-pod -_pkgreal=Test-Pod -pkgver=1.45 -pkgrel=0 -pkgdesc="check for POD errors in files" -url="http://search.cpan.org/dist/Test-Pod/" -arch="noarch" -license="GPL PerlArtistic" -cpandepends="" -cpanmakedepends="" -depends="$cpandepends" -makedepends="perl-dev $cpanmakedepends" -subpackages="$pkgname-doc" -source="http://search.cpan.org/CPAN/authors/id/D/DW/DWHEELER/$_pkgreal-$pkgver.tar.gz" - -_builddir="$srcdir/$_pkgreal-$pkgver" - -prepare() { - cd "$_builddir" - perl Build.PL installdirs=vendor || return 1 -} - -build() { - cd "$_builddir" - export CFLAGS=`perl -MConfig -E 'say $Config{ccflags}'` - ./Build && ./Build test -} - -package() { - cd "$_builddir" - ./Build install destdir="$pkgdir" || return 1 - find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete -} - -md5sums="089c8f272931df82f6c4d11a74f04628 Test-Pod-1.45.tar.gz" |