diff options
29 files changed, 598 insertions, 137 deletions
diff --git a/main/abuild/APKBUILD b/main/abuild/APKBUILD index 5dee5b234a..fc64521290 100644 --- a/main/abuild/APKBUILD +++ b/main/abuild/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgdesc="Script to build Alpine Packages" pkgname=abuild -pkgver=2.7.4 +pkgver=2.8.2 pkgrel=0 url=http://git.alpinelinux.org/cgit/abuild/ source="http://git.alpinelinux.org/cgit/abuild.git/snapshot/abuild-$pkgver.tar.bz2 @@ -37,4 +37,4 @@ package() { install -d -m 775 -g abuild "$pkgdir"/var/cache/distfiles } -md5sums="b39a68e836b8873307cf6617f1bfeb23 abuild-2.7.4.tar.bz2" +md5sums="77208071fdeb879cd17ec62a81bdd680 abuild-2.8.2.tar.bz2" diff --git a/main/acf-alpine-baselayout/APKBUILD b/main/acf-alpine-baselayout/APKBUILD index eb02f0fddd..cc71a24ace 100644 --- a/main/acf-alpine-baselayout/APKBUILD +++ b/main/acf-alpine-baselayout/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Ted Trask <ttrask01@yahoo.com> # Maintainer: Ted Trask <ttrask01@yahoo.com> pkgname=acf-alpine-baselayout -pkgver=0.8.1 +pkgver=0.8.2 pkgrel=0 pkgdesc="A web-based system administration interface for alpine-baselayout" url="http://git.alpinelinux.org/cgit/acf-alpine-baselayout" @@ -15,4 +15,4 @@ package() { make DESTDIR="$pkgdir" install } -md5sums="b5db0e519b6254c3120efeec4175f0fd acf-alpine-baselayout-0.8.1.tar.bz2" +md5sums="3c621d2dfbafc11224139083c8be2bdc acf-alpine-baselayout-0.8.2.tar.bz2" diff --git a/main/acf-asterisk/APKBUILD b/main/acf-asterisk/APKBUILD index 90fd6172ba..f36c20e7c0 100644 --- a/main/acf-asterisk/APKBUILD +++ b/main/acf-asterisk/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Ted Trask <ttrask01@yahoo.com> # Maintainer: Ted Trask <ttrask01@yahoo.com> pkgname=acf-asterisk -pkgver=0.2.3 -pkgrel=2 +pkgver=0.3.0 +pkgrel=0 pkgdesc="A web-based system administration interface for asterisk" url="http://git.alpinelinux.org/cgit/acf-asterisk" arch="noarch" @@ -20,4 +20,4 @@ package() { } -md5sums="7ad426d23385b6bcc295a330526dcb69 acf-asterisk-0.2.3.tar.bz2" +md5sums="961ce238956562b60d264fdb45355e9f acf-asterisk-0.3.0.tar.bz2" diff --git a/main/acf-core/APKBUILD b/main/acf-core/APKBUILD index 0a73ac388a..19316ab918 100644 --- a/main/acf-core/APKBUILD +++ b/main/acf-core/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Ted Trask <ttrask01@yahoo.com> # Maintainer: Ted Trask <ttrask01@yahoo.com> pkgname=acf-core -pkgver=0.12.0 -pkgrel=2 +pkgver=0.13.0 +pkgrel=0 pkgdesc="A web-based system administration interface framework" url="http://git.alpinelinux.org/cgit/acf-core" arch="noarch" @@ -15,4 +15,4 @@ package() { cd "$srcdir/$pkgname-$pkgver" make DESTDIR="$pkgdir" install } -md5sums="f44c74e0ceebdc953553c6dc7386f3a7 acf-core-0.12.0.tar.bz2" +md5sums="a8b37ce56333d783c1b30561c5b78027 acf-core-0.13.0.tar.bz2" diff --git a/main/acf-dansguardian/APKBUILD b/main/acf-dansguardian/APKBUILD index 4c7aba5157..cdbdc54b78 100644 --- a/main/acf-dansguardian/APKBUILD +++ b/main/acf-dansguardian/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Ted Trask <ttrask01@yahoo.com> # Maintainer: Ted Trask <ttrask01@yahoo.com> pkgname=acf-dansguardian -pkgver=0.3.3 -pkgrel=2 +pkgver=0.4.0 +pkgrel=0 pkgdesc="A web-based system administration interface for dansguardian" url="http://git.alpinelinux.org/cgit/acf-dansguardian" arch="noarch" @@ -20,4 +20,4 @@ package() { } -md5sums="2a6eae287f2e9315bd822b6a41bf41ed acf-dansguardian-0.3.3.tar.bz2" +md5sums="864ac9cbf48ad1658ca2c1c6ce471799 acf-dansguardian-0.4.0.tar.bz2" diff --git a/main/acf-dnscache/APKBUILD b/main/acf-dnscache/APKBUILD index 1d2963390b..d593675e13 100644 --- a/main/acf-dnscache/APKBUILD +++ b/main/acf-dnscache/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Ted Trask <ttrask01@yahoo.com> # Maintainer: Ted Trask <ttrask01@yahoo.com> pkgname=acf-dnscache -pkgver=0.2.2 -pkgrel=3 +pkgver=0.3.0 +pkgrel=0 pkgdesc="A web-based system administration interface for dnscache" url="http://git.alpinelinux.org/cgit/acf-dnscache" arch="noarch" @@ -14,4 +14,4 @@ package() { cd "$srcdir/$pkgname-$pkgver" make DESTDIR="$pkgdir" install } -md5sums="fca9c93b1ed06e1391c44fe783056a46 acf-dnscache-0.2.2.tar.bz2" +md5sums="eec8af4eb887448613626d8b08cdc456 acf-dnscache-0.3.0.tar.bz2" diff --git a/main/acf-dnsmasq/APKBUILD b/main/acf-dnsmasq/APKBUILD index ec11bc93e0..6b6b03d6bb 100644 --- a/main/acf-dnsmasq/APKBUILD +++ b/main/acf-dnsmasq/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Ted Trask <ttrask01@yahoo.com> # Maintainer: Ted Trask <ttrask01@yahoo.com> pkgname=acf-dnsmasq -pkgver=0.2.2 -pkgrel=2 +pkgver=0.3.0 +pkgrel=0 pkgdesc="A web-based system administration interface for dnsmasq" url="http://git.alpinelinux.org/cgit/acf-dnsmasq" arch="noarch" @@ -14,4 +14,4 @@ package() { cd "$srcdir/$pkgname-$pkgver" make DESTDIR="$pkgdir" install } -md5sums="ab84c2ebab6dae6628326c8f7aefcfa6 acf-dnsmasq-0.2.2.tar.bz2" +md5sums="5c1843623c805fbf9be4dcde32049206 acf-dnsmasq-0.3.0.tar.bz2" diff --git a/main/acf-fetchmail/APKBUILD b/main/acf-fetchmail/APKBUILD index 4ff6a4bb6e..68f1e79602 100644 --- a/main/acf-fetchmail/APKBUILD +++ b/main/acf-fetchmail/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Ted Trask <ttrask01@yahoo.com> # Maintainer: Ted Trask <ttrask01@yahoo.com> pkgname=acf-fetchmail -pkgver=0.4.2 -pkgrel=2 +pkgver=0.5.0 +pkgrel=0 pkgdesc="A web-based system administration interface for fetchmail" url="http://git.alpinelinux.org/cgit/acf-fetchmail" arch="noarch" @@ -20,4 +20,4 @@ package() { } -md5sums="bfa66c719cfbc6075e4773311730318b acf-fetchmail-0.4.2.tar.bz2" +md5sums="41ae8840c5d4cdceb5b21fc9e8debf1b acf-fetchmail-0.5.0.tar.bz2" diff --git a/main/acf-ipsec-tools/APKBUILD b/main/acf-ipsec-tools/APKBUILD index be5c707e4c..9c27aded07 100644 --- a/main/acf-ipsec-tools/APKBUILD +++ b/main/acf-ipsec-tools/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Ted Trask <ttrask01@yahoo.com> # Maintainer: Ted Trask <ttrask01@yahoo.com> pkgname=acf-ipsec-tools -pkgver=0.6.1 -pkgrel=2 +pkgver=0.7.0 +pkgrel=0 pkgdesc="A web-based system administration interface for ipsec-tools" url="http://git.alpinelinux.org/cgit/acf-ipsec-tools" arch="noarch" @@ -14,4 +14,4 @@ package() { cd "$srcdir/$pkgname-$pkgver" make DESTDIR="$pkgdir" install } -md5sums="eb1c906a3691789178e118ca8809af47 acf-ipsec-tools-0.6.1.tar.bz2" +md5sums="819f891066ca94640d5b7ef3dd985296 acf-ipsec-tools-0.7.0.tar.bz2" diff --git a/main/acf-shorewall/APKBUILD b/main/acf-shorewall/APKBUILD index 61f3ea74aa..c96fc18a83 100644 --- a/main/acf-shorewall/APKBUILD +++ b/main/acf-shorewall/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Ted Trask <ttrask01@yahoo.com> # Maintainer: Ted Trask <ttrask01@yahoo.com> pkgname=acf-shorewall -pkgver=0.6.2 -pkgrel=2 +pkgver=0.7.0 +pkgrel=0 pkgdesc="A web-based system administration interface for shorewall" url="http://git.alpinelinux.org/cgit/acf-shorewall" arch="noarch" @@ -14,4 +14,4 @@ package() { cd "$srcdir/$pkgname-$pkgver" make DESTDIR="$pkgdir" install } -md5sums="d92c0f4ebdbe52dff156a13c08055cf9 acf-shorewall-0.6.2.tar.bz2" +md5sums="190a278c301d0b20afc512b9585148c0 acf-shorewall-0.7.0.tar.bz2" diff --git a/main/acf-tinydns/APKBUILD b/main/acf-tinydns/APKBUILD index 5df08cc054..df95195d48 100644 --- a/main/acf-tinydns/APKBUILD +++ b/main/acf-tinydns/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Ted Trask <ttrask01@yahoo.com> # Maintainer: Ted Trask <ttrask01@yahoo.com> pkgname=acf-tinydns -pkgver=0.6.0 -pkgrel=2 +pkgver=0.7.0 +pkgrel=0 pkgdesc="A web-based system administration interface for tinydns" url="http://git.alpinelinux.org/cgit/acf-tinydns" arch="noarch" @@ -14,4 +14,4 @@ package() { cd "$srcdir/$pkgname-$pkgver" make DESTDIR="$pkgdir" install } -md5sums="7cb568e6960b1e13da492827d47c1fbd acf-tinydns-0.6.0.tar.bz2" +md5sums="20597fd493bd37414247abd4b1ae10ed acf-tinydns-0.7.0.tar.bz2" diff --git a/main/doxygen/APKBUILD b/main/doxygen/APKBUILD index 6d672743f1..716db23ebf 100644 --- a/main/doxygen/APKBUILD +++ b/main/doxygen/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=doxygen -pkgver=1.7.3 +pkgver=1.7.4 pkgrel=0 pkgdesc="A documentation system for C++, C, Java, IDL and PHP" url="http://www.doxygen.org/" @@ -43,4 +43,4 @@ package() { make DESTDIR="$pkgdir" MAN1DIR=share/man/man1 install } -md5sums="6cc5ad566dbec5cf843dc600b1162808 doxygen-1.7.3.src.tar.gz" +md5sums="ff908759ff7cd9464424b04ae6c68e48 doxygen-1.7.4.src.tar.gz" diff --git a/main/imagemagick/APKBUILD b/main/imagemagick/APKBUILD index ad9de7e1a7..cf318cd584 100644 --- a/main/imagemagick/APKBUILD +++ b/main/imagemagick/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Carlo Landmeter <clandmeter@gmail.com> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=imagemagick -pkgver=6.6.8.7 +pkgver=6.6.9.1 _pkgver=${pkgver%.*}-${pkgver##*.} pkgrel=0 pkgdesc="A collection of tools and libraries for many image formats" @@ -48,4 +48,4 @@ dev() { "$pkgdir"/usr/lib/ImageMagick-$_v/modules-Q16/filters/ } -md5sums="f719a8e814dd926b1c9ddd7b9ebd6e3a ImageMagick-6.6.8-7.tar.gz" +md5sums="560dbda9acb7c95672caf3cccadc8a0f ImageMagick-6.6.9-1.tar.gz" diff --git a/main/ipsec-tools/20-grekey-support.patch b/main/ipsec-tools/20-grekey-support.patch index 9ad2bca740..17fea3e991 100644 --- a/main/ipsec-tools/20-grekey-support.patch +++ b/main/ipsec-tools/20-grekey-support.patch @@ -1,7 +1,7 @@ Index: ipsec-tools-cvs-HEAD/src/racoon/racoonctl.c =================================================================== ---- ipsec-tools-cvs-HEAD.orig/src/racoon/racoonctl.c 2011-03-03 19:28:29.000000000 +0200 -+++ ipsec-tools-cvs-HEAD/src/racoon/racoonctl.c 2011-03-03 19:29:42.000000000 +0200 +--- ipsec-tools-cvs-HEAD.orig/src/racoon/racoonctl.c 2011-03-05 09:23:59.000000000 +0200 ++++ ipsec-tools-cvs-HEAD/src/racoon/racoonctl.c 2011-03-29 22:08:43.000000000 +0300 @@ -232,7 +232,7 @@ "\n" " <saopts>: \"isakmp\" <family> <src> <dst>\n" @@ -83,8 +83,8 @@ Index: ipsec-tools-cvs-HEAD/src/racoon/racoonctl.c if (p_port) Index: ipsec-tools-cvs-HEAD/src/racoon/admin.c =================================================================== ---- ipsec-tools-cvs-HEAD.orig/src/racoon/admin.c 2011-03-03 19:28:29.000000000 +0200 -+++ ipsec-tools-cvs-HEAD/src/racoon/admin.c 2011-03-03 21:16:47.000000000 +0200 +--- ipsec-tools-cvs-HEAD.orig/src/racoon/admin.c 2011-03-05 09:23:59.000000000 +0200 ++++ ipsec-tools-cvs-HEAD/src/racoon/admin.c 2011-03-30 09:41:46.000000000 +0300 @@ -444,7 +444,7 @@ /* search appropreate configuration */ @@ -94,27 +94,18 @@ Index: ipsec-tools-cvs-HEAD/src/racoon/admin.c else rmconf = getrmconf_by_name(name); if (rmconf == NULL) { -@@ -536,6 +536,16 @@ +@@ -536,6 +536,7 @@ spidx.prefs = ndx->prefd; spidx.prefd = ndx->prefs; spidx.ul_proto = ndx->ul_proto; -+ switch (ndx->ul_proto) { -+ case IPPROTO_ICMP: -+ case IPPROTO_ICMPV6: -+ case IPPROTO_GRE: -+ /* Ports are UL specific data, and should -+ * not get swapped */ -+ set_port((struct sockaddr *) &spidx.src, extract_port(src)); -+ set_port((struct sockaddr *) &spidx.dst, extract_port(dst)); -+ break; -+ } ++ spidx_normalize_ulports(&spidx); sp_in = getsp_r(&spidx); if (sp_in) { Index: ipsec-tools-cvs-HEAD/src/racoon/cftoken.l =================================================================== ---- ipsec-tools-cvs-HEAD.orig/src/racoon/cftoken.l 2011-03-03 19:57:26.000000000 +0200 -+++ ipsec-tools-cvs-HEAD/src/racoon/cftoken.l 2011-03-04 13:07:03.000000000 +0200 +--- ipsec-tools-cvs-HEAD.orig/src/racoon/cftoken.l 2011-03-05 09:23:59.000000000 +0200 ++++ ipsec-tools-cvs-HEAD/src/racoon/cftoken.l 2011-03-29 22:08:43.000000000 +0300 @@ -288,6 +288,7 @@ <S_SAINF>any { YYD; return(ANY); } <S_SAINF>from { YYD; return(FROM); } @@ -125,9 +116,9 @@ Index: ipsec-tools-cvs-HEAD/src/racoon/cftoken.l <S_SAINF>{semi} { BEGIN S_INI; return(EOS); } Index: ipsec-tools-cvs-HEAD/src/racoon/cfparse.y =================================================================== ---- ipsec-tools-cvs-HEAD.orig/src/racoon/cfparse.y 2011-03-03 19:57:30.000000000 +0200 -+++ ipsec-tools-cvs-HEAD/src/racoon/cfparse.y 2011-03-04 13:09:01.000000000 +0200 -@@ -213,7 +213,7 @@ +--- ipsec-tools-cvs-HEAD.orig/src/racoon/cfparse.y 2011-03-14 19:12:41.000000000 +0200 ++++ ipsec-tools-cvs-HEAD/src/racoon/cfparse.y 2011-03-29 22:08:43.000000000 +0300 +@@ -214,7 +214,7 @@ /* algorithm */ %token ALGORITHM_CLASS ALGORITHMTYPE STRENGTHTYPE /* sainfo */ @@ -136,7 +127,7 @@ Index: ipsec-tools-cvs-HEAD/src/racoon/cfparse.y /* remote */ %token REMOTE ANONYMOUS CLIENTADDR INHERIT REMOTE_ADDRESS %token EXCHANGE_MODE EXCHANGETYPE DOI DOITYPE SITUATION SITUATIONTYPE -@@ -1301,6 +1301,35 @@ +@@ -1302,6 +1302,35 @@ cur_sainfo->idsrc = $1; cur_sainfo->iddst = $2; } @@ -172,7 +163,7 @@ Index: ipsec-tools-cvs-HEAD/src/racoon/cfparse.y ; sainfo_id : IDENTIFIERTYPE ADDRSTRING prefix port ul_proto -@@ -1667,7 +1696,7 @@ +@@ -1668,7 +1697,7 @@ { struct remoteconf *from, *new; @@ -183,13 +174,14 @@ Index: ipsec-tools-cvs-HEAD/src/racoon/cfparse.y saddr2str($4)); Index: ipsec-tools-cvs-HEAD/src/racoon/ipsec_doi.h =================================================================== ---- ipsec-tools-cvs-HEAD.orig/src/racoon/ipsec_doi.h 2011-03-03 20:19:23.000000000 +0200 -+++ ipsec-tools-cvs-HEAD/src/racoon/ipsec_doi.h 2011-03-03 20:42:35.000000000 +0200 -@@ -227,6 +227,9 @@ +--- ipsec-tools-cvs-HEAD.orig/src/racoon/ipsec_doi.h 2011-03-05 09:23:59.000000000 +0200 ++++ ipsec-tools-cvs-HEAD/src/racoon/ipsec_doi.h 2011-03-30 09:22:13.000000000 +0300 +@@ -227,6 +227,10 @@ extern int set_identifier_qual __P((vchar_t **, int, vchar_t *, int)); extern int ipsecdoi_setid2 __P((struct ph2handle *)); extern vchar_t *ipsecdoi_sockaddr2id __P((struct sockaddr *, u_int, u_int)); +extern int ipsecdoi_fixup_id_uldata __P((vchar_t *, vchar_t *, u_int16_t, u_int16_t, u_int16_t)); ++extern int ipsecdoi_normalize_id_uldata __P((vchar_t *, vchar_t *)); +extern int ipsecdoi_id_has_port __P((vchar_t *)); + extern int ipsecdoi_id2sockaddr __P((vchar_t *, struct sockaddr *, @@ -197,9 +189,36 @@ Index: ipsec-tools-cvs-HEAD/src/racoon/ipsec_doi.h extern char *ipsecdoi_id2str __P((const vchar_t *)); Index: ipsec-tools-cvs-HEAD/src/racoon/ipsec_doi.c =================================================================== ---- ipsec-tools-cvs-HEAD.orig/src/racoon/ipsec_doi.c 2011-03-03 20:19:23.000000000 +0200 -+++ ipsec-tools-cvs-HEAD/src/racoon/ipsec_doi.c 2011-03-03 21:01:16.000000000 +0200 -@@ -3371,6 +3371,7 @@ +--- ipsec-tools-cvs-HEAD.orig/src/racoon/ipsec_doi.c 2011-03-05 09:23:59.000000000 +0200 ++++ ipsec-tools-cvs-HEAD/src/racoon/ipsec_doi.c 2011-03-30 16:59:49.000000000 +0300 +@@ -3308,6 +3308,7 @@ + const vchar_t *subnet; + const vchar_t *address; + { ++ struct in_addr *a, *b; + struct in_addr *mask; + + if (address->l != sizeof(struct in_addr)) +@@ -3316,12 +3317,15 @@ + if (subnet->l != (sizeof(struct in_addr)*2)) + return 1; + ++ a = (struct in_addr*)(subnet->v); ++ b = (struct in_addr*)(address->v); + mask = (struct in_addr*)(subnet->v + sizeof(struct in_addr)); + +- if (mask->s_addr!=0xffffffff) +- return 1; ++ //if (mask->s_addr!=0xffffffff) ++ // return 1; ++ //return memcmp(subnet->v,address->v,address->l); + +- return memcmp(subnet->v,address->v,address->l); ++ return (a->s_addr & mask->s_addr) != (b->s_addr & mask->s_addr); + } + + #ifdef INET6 +@@ -3371,6 +3375,7 @@ vchar_t ident_t; vchar_t ident_s; int result; @@ -207,7 +226,37 @@ Index: ipsec-tools-cvs-HEAD/src/racoon/ipsec_doi.c /* handle wildcard IDs */ -@@ -3460,6 +3461,7 @@ +@@ -3410,12 +3415,14 @@ + + if ((id_bs->type == IPSECDOI_ID_IPV4_ADDR)&& + (id_bt->type == IPSECDOI_ID_IPV4_ADDR_SUBNET)) { ++ check_ports = 1; + result = ipsecdoi_subnetisaddr_v4(&ident_t,&ident_s); + goto cmpid_result; + } + + if ((id_bs->type == IPSECDOI_ID_IPV4_ADDR_SUBNET)&& + (id_bt->type == IPSECDOI_ID_IPV4_ADDR)) { ++ check_ports = 1; + result = ipsecdoi_subnetisaddr_v4(&ident_s,&ident_t); + goto cmpid_result; + } +@@ -3423,12 +3430,14 @@ + #ifdef INET6 + if ((id_bs->type == IPSECDOI_ID_IPV6_ADDR)&& + (id_bt->type == IPSECDOI_ID_IPV6_ADDR_SUBNET)) { ++ check_ports = 1; + result = ipsecdoi_subnetisaddr_v6(&ident_t,&ident_s); + goto cmpid_result; + } + + if ((id_bs->type == IPSECDOI_ID_IPV6_ADDR_SUBNET)&& + (id_bt->type == IPSECDOI_ID_IPV6_ADDR)) { ++ check_ports = 1; + result = ipsecdoi_subnetisaddr_v6(&ident_s,&ident_t); + goto cmpid_result; + } +@@ -3460,6 +3469,7 @@ case IPSECDOI_ID_IPV4_ADDR: /* validate lengths */ @@ -215,7 +264,7 @@ Index: ipsec-tools-cvs-HEAD/src/racoon/ipsec_doi.c if ((ident_t.l != sizeof(struct in_addr))|| (ident_s.l != sizeof(struct in_addr))) goto cmpid_invalid; -@@ -3468,6 +3470,7 @@ +@@ -3468,6 +3478,7 @@ case IPSECDOI_ID_IPV4_ADDR_SUBNET: case IPSECDOI_ID_IPV4_ADDR_RANGE: /* validate lengths */ @@ -223,7 +272,7 @@ Index: ipsec-tools-cvs-HEAD/src/racoon/ipsec_doi.c if ((ident_t.l != (sizeof(struct in_addr)*2))|| (ident_s.l != (sizeof(struct in_addr)*2))) goto cmpid_invalid; -@@ -3476,6 +3479,7 @@ +@@ -3476,6 +3487,7 @@ #ifdef INET6 case IPSECDOI_ID_IPV6_ADDR: /* validate lengths */ @@ -231,7 +280,7 @@ Index: ipsec-tools-cvs-HEAD/src/racoon/ipsec_doi.c if ((ident_t.l != sizeof(struct in6_addr))|| (ident_s.l != sizeof(struct in6_addr))) goto cmpid_invalid; -@@ -3484,6 +3488,7 @@ +@@ -3484,6 +3496,7 @@ case IPSECDOI_ID_IPV6_ADDR_SUBNET: case IPSECDOI_ID_IPV6_ADDR_RANGE: /* validate lengths */ @@ -239,26 +288,29 @@ Index: ipsec-tools-cvs-HEAD/src/racoon/ipsec_doi.c if ((ident_t.l != (sizeof(struct in6_addr)*2))|| (ident_s.l != (sizeof(struct in6_addr)*2))) goto cmpid_invalid; -@@ -3502,10 +3507,15 @@ +@@ -3502,12 +3515,18 @@ } /* validate matching data and length */ - if (ident_t.l == ident_s.l) - result = memcmp(ident_t.v,ident_s.v,ident_t.l); - else -+ if (check_ports && -+ (id_bt->port != id_bs->port && id_bs->port != 0)) -+ /* if target is wildcard, source should be too, otherwise -+ * specific rule matches wildcard request */ ++ if (ident_t.l != ident_s.l) result = 1; -+ else if (ident_t.l != ident_s.l) -+ result = 1; + else + result = memcmp(ident_t.v,ident_s.v,ident_t.l); cmpid_result: ++ if (check_ports && ++ (id_bt->port != id_bs->port && id_bs->port != 0)) { ++ /* if target is wildcard, source should be too, otherwise ++ * specific rule matches wildcard request */ ++ result = 1; ++ } -@@ -4089,6 +4099,44 @@ + /* debug level output */ + if(loglevel >= LLV_DEBUG) { +@@ -4089,6 +4108,67 @@ return new; } @@ -280,6 +332,29 @@ Index: ipsec-tools-cvs-HEAD/src/racoon/ipsec_doi.c + return 0; +} + ++int ipsecdoi_normalize_id_uldata(srcid, dstid) ++ vchar_t *srcid, *dstid; ++{ ++ struct ipsecdoi_id_b *src = (struct ipsecdoi_id_b *) srcid->v; ++ struct ipsecdoi_id_b *dst = (struct ipsecdoi_id_b *) dstid->v; ++ u_int16_t tmp; ++ ++ if (src->proto_id != dst->proto_id) ++ return -1; ++ ++ switch (src->proto_id) { ++ case IPPROTO_ICMP: ++ case IPPROTO_ICMPV6: ++ case IPPROTO_GRE: ++ tmp = src->port; ++ src->port = dst->port; ++ dst->port = tmp; ++ break; ++ } ++ ++ return 0; ++} ++ +int ipsecdoi_id_has_port(id) + vchar_t *id; +{ @@ -303,7 +378,7 @@ Index: ipsec-tools-cvs-HEAD/src/racoon/ipsec_doi.c vchar_t * ipsecdoi_sockrange2id(laddr, haddr, ul_proto) struct sockaddr *laddr, *haddr; -@@ -4318,7 +4366,7 @@ +@@ -4318,7 +4398,7 @@ saddr.sa.sa_len = sizeof(struct sockaddr_in); #endif saddr.sa.sa_family = AF_INET; @@ -312,7 +387,7 @@ Index: ipsec-tools-cvs-HEAD/src/racoon/ipsec_doi.c memcpy(&saddr.sin.sin_addr, id->v + sizeof(*id_b), sizeof(struct in_addr)); break; -@@ -4331,7 +4379,7 @@ +@@ -4331,7 +4411,7 @@ saddr.sa.sa_len = sizeof(struct sockaddr_in6); #endif saddr.sa.sa_family = AF_INET6; @@ -321,7 +396,7 @@ Index: ipsec-tools-cvs-HEAD/src/racoon/ipsec_doi.c memcpy(&saddr.sin6.sin6_addr, id->v + sizeof(*id_b), sizeof(struct in6_addr)); saddr.sin6.sin6_scope_id = -@@ -4347,7 +4395,7 @@ +@@ -4347,7 +4427,7 @@ #ifdef INET6 case IPSECDOI_ID_IPV6_ADDR: #endif @@ -330,7 +405,7 @@ Index: ipsec-tools-cvs-HEAD/src/racoon/ipsec_doi.c break; case IPSECDOI_ID_IPV4_ADDR_SUBNET: -@@ -4403,7 +4451,9 @@ +@@ -4403,7 +4483,9 @@ plen += l; } @@ -341,7 +416,7 @@ Index: ipsec-tools-cvs-HEAD/src/racoon/ipsec_doi.c } break; -@@ -4415,12 +4465,12 @@ +@@ -4415,12 +4497,12 @@ saddr.sa.sa_len = sizeof(struct sockaddr_in); #endif saddr.sa.sa_family = AF_INET; @@ -356,7 +431,7 @@ Index: ipsec-tools-cvs-HEAD/src/racoon/ipsec_doi.c break; #ifdef INET6 -@@ -4431,7 +4481,7 @@ +@@ -4431,7 +4513,7 @@ saddr.sa.sa_len = sizeof(struct sockaddr_in6); #endif saddr.sa.sa_family = AF_INET6; @@ -365,7 +440,7 @@ Index: ipsec-tools-cvs-HEAD/src/racoon/ipsec_doi.c memcpy(&saddr.sin6.sin6_addr, id->v + sizeof(*id_b) + sizeof(struct in6_addr), sizeof(struct in6_addr)); -@@ -4440,7 +4490,7 @@ +@@ -4440,7 +4522,7 @@ ? ((struct sockaddr_in6 *)id_b)->sin6_scope_id : 0); @@ -376,8 +451,8 @@ Index: ipsec-tools-cvs-HEAD/src/racoon/ipsec_doi.c Index: ipsec-tools-cvs-HEAD/src/racoon/sainfo.c =================================================================== ---- ipsec-tools-cvs-HEAD.orig/src/racoon/sainfo.c 2011-03-03 20:07:44.000000000 +0200 -+++ ipsec-tools-cvs-HEAD/src/racoon/sainfo.c 2011-03-03 20:55:02.000000000 +0200 +--- ipsec-tools-cvs-HEAD.orig/src/racoon/sainfo.c 2011-03-05 09:23:59.000000000 +0200 ++++ ipsec-tools-cvs-HEAD/src/racoon/sainfo.c 2011-03-29 22:08:44.000000000 +0300 @@ -124,7 +124,7 @@ plog(LLV_DEBUG, LOCATION, NULL, "evaluating sainfo: %s\n", sainfostr); @@ -416,9 +491,9 @@ Index: ipsec-tools-cvs-HEAD/src/racoon/sainfo.c } Index: ipsec-tools-cvs-HEAD/src/racoon/isakmp.c =================================================================== ---- ipsec-tools-cvs-HEAD.orig/src/racoon/isakmp.c 2011-03-03 20:55:57.000000000 +0200 -+++ ipsec-tools-cvs-HEAD/src/racoon/isakmp.c 2011-03-03 21:14:13.000000000 +0200 -@@ -2170,7 +2170,15 @@ +--- ipsec-tools-cvs-HEAD.orig/src/racoon/isakmp.c 2011-03-14 19:18:12.000000000 +0200 ++++ ipsec-tools-cvs-HEAD/src/racoon/isakmp.c 2011-03-30 09:41:46.000000000 +0300 +@@ -2173,7 +2173,15 @@ * so no need to bother yet. --arno */ if (iph1hint == NULL || iph1hint->rmconf == NULL) { @@ -435,7 +510,7 @@ Index: ipsec-tools-cvs-HEAD/src/racoon/isakmp.c if (rmconf == NULL) { plog(LLV_ERROR, LOCATION, NULL, "no configuration found for %s.\n", -@@ -2246,7 +2254,7 @@ +@@ -2249,7 +2257,7 @@ struct secpolicy *sp_out, *sp_in; { struct remoteconf *conf; @@ -444,7 +519,7 @@ Index: ipsec-tools-cvs-HEAD/src/racoon/isakmp.c plog(LLV_DEBUG, LOCATION, NULL, "new acquire %s\n", spidx2str(&sp_out->spidx)); -@@ -2273,7 +2281,7 @@ +@@ -2276,7 +2284,7 @@ return -1; } @@ -453,10 +528,27 @@ Index: ipsec-tools-cvs-HEAD/src/racoon/isakmp.c if (conf != NULL) remoteid = conf->ph1id; else +@@ -3582,6 +3590,8 @@ + + #undef _XIDT + ++ spidx_normalize_ulports(&spidx); ++ + plog(LLV_DEBUG, LOCATION, NULL, + "get a src address from ID payload " + "%s prefixlen=%u ul_proto=%u\n", +@@ -3654,6 +3664,7 @@ + pref = spidx.prefs; + spidx.prefs = spidx.prefd; + spidx.prefd = pref; ++ spidx_normalize_ulports(&spidx); + + if (pk_sendspddelete(iph2) < 0) { + plog(LLV_ERROR, LOCATION, NULL, Index: ipsec-tools-cvs-HEAD/src/racoon/remoteconf.c =================================================================== ---- ipsec-tools-cvs-HEAD.orig/src/racoon/remoteconf.c 2011-03-03 21:06:03.000000000 +0200 -+++ ipsec-tools-cvs-HEAD/src/racoon/remoteconf.c 2011-03-03 21:17:09.000000000 +0200 +--- ipsec-tools-cvs-HEAD.orig/src/racoon/remoteconf.c 2011-03-14 19:12:41.000000000 +0200 ++++ ipsec-tools-cvs-HEAD/src/racoon/remoteconf.c 2011-03-29 22:08:44.000000000 +0300 @@ -217,6 +217,13 @@ return MATCH_NONE; } @@ -493,8 +585,8 @@ Index: ipsec-tools-cvs-HEAD/src/racoon/remoteconf.c plog(LLV_ERROR, LOCATION, remote, Index: ipsec-tools-cvs-HEAD/src/racoon/remoteconf.h =================================================================== ---- ipsec-tools-cvs-HEAD.orig/src/racoon/remoteconf.h 2011-03-03 21:06:03.000000000 +0200 -+++ ipsec-tools-cvs-HEAD/src/racoon/remoteconf.h 2011-03-03 21:10:53.000000000 +0200 +--- ipsec-tools-cvs-HEAD.orig/src/racoon/remoteconf.h 2011-03-14 19:12:41.000000000 +0200 ++++ ipsec-tools-cvs-HEAD/src/racoon/remoteconf.h 2011-03-29 22:08:44.000000000 +0300 @@ -178,6 +178,7 @@ int flags; struct sockaddr *remote; @@ -520,9 +612,17 @@ Index: ipsec-tools-cvs-HEAD/src/racoon/remoteconf.h Index: ipsec-tools-cvs-HEAD/src/racoon/pfkey.c =================================================================== ---- ipsec-tools-cvs-HEAD.orig/src/racoon/pfkey.c 2011-03-03 21:14:45.000000000 +0200 -+++ ipsec-tools-cvs-HEAD/src/racoon/pfkey.c 2011-03-03 21:16:17.000000000 +0200 -@@ -2898,7 +2898,7 @@ +--- ipsec-tools-cvs-HEAD.orig/src/racoon/pfkey.c 2011-03-14 19:18:13.000000000 +0200 ++++ ipsec-tools-cvs-HEAD/src/racoon/pfkey.c 2011-03-30 08:21:09.000000000 +0300 +@@ -1886,6 +1886,7 @@ + spidx.prefs = sp_out->spidx.prefd; + spidx.prefd = sp_out->spidx.prefs; + spidx.ul_proto = sp_out->spidx.ul_proto; ++ spidx_normalize_ulports(&spidx); + + #ifdef HAVE_SECCTX + if (m_sec_ctx) { +@@ -2898,7 +2899,7 @@ /* If we are not acting as initiator, let's just leave and * let the remote peer handle the restart */ @@ -531,7 +631,7 @@ Index: ipsec-tools-cvs-HEAD/src/racoon/pfkey.c if (rmconf == NULL || !rmconf->passive) { iph1->status = PHASE1ST_EXPIRED; sched_schedule(&iph1->sce, 1, isakmp_ph1delete_stub); -@@ -3068,8 +3068,10 @@ +@@ -3068,8 +3069,10 @@ if (iph2->ph1 && iph2->ph1->rmconf) rmconf = iph2->ph1->rmconf; @@ -545,8 +645,8 @@ Index: ipsec-tools-cvs-HEAD/src/racoon/pfkey.c struct ph1handle *iph1hint; Index: ipsec-tools-cvs-HEAD/src/setkey/setkey.8 =================================================================== ---- ipsec-tools-cvs-HEAD.orig/src/setkey/setkey.8 2011-03-04 11:48:30.000000000 +0200 -+++ ipsec-tools-cvs-HEAD/src/setkey/setkey.8 2011-03-04 11:48:56.000000000 +0200 +--- ipsec-tools-cvs-HEAD.orig/src/setkey/setkey.8 2011-03-05 09:23:59.000000000 +0200 ++++ ipsec-tools-cvs-HEAD/src/setkey/setkey.8 2011-03-29 22:08:44.000000000 +0300 @@ -453,7 +453,7 @@ .Pp A second example of requiring transport mode encryption of specific @@ -558,8 +658,8 @@ Index: ipsec-tools-cvs-HEAD/src/setkey/setkey.8 .Ar upperspec Index: ipsec-tools-cvs-HEAD/src/racoon/racoon.conf.5 =================================================================== ---- ipsec-tools-cvs-HEAD.orig/src/racoon/racoon.conf.5 2011-03-04 11:57:36.000000000 +0200 -+++ ipsec-tools-cvs-HEAD/src/racoon/racoon.conf.5 2011-03-04 12:01:13.000000000 +0200 +--- ipsec-tools-cvs-HEAD.orig/src/racoon/racoon.conf.5 2011-03-05 09:23:59.000000000 +0200 ++++ ipsec-tools-cvs-HEAD/src/racoon/racoon.conf.5 2011-03-29 22:08:44.000000000 +0300 @@ -981,6 +981,7 @@ .Bl -tag -width Ds -compact .It Ic sainfo Po Ar local_id | Ic anonymous Pc \ @@ -586,8 +686,8 @@ Index: ipsec-tools-cvs-HEAD/src/racoon/racoon.conf.5 keyword allows an sainfo to only match for peers that use a specific phase1 Index: ipsec-tools-cvs-HEAD/src/setkey/parse.y =================================================================== ---- ipsec-tools-cvs-HEAD.orig/src/setkey/parse.y 2011-03-04 13:04:05.000000000 +0200 -+++ ipsec-tools-cvs-HEAD/src/setkey/parse.y 2011-03-04 13:04:09.000000000 +0200 +--- ipsec-tools-cvs-HEAD.orig/src/setkey/parse.y 2011-03-05 09:23:59.000000000 +0200 ++++ ipsec-tools-cvs-HEAD/src/setkey/parse.y 2011-03-29 22:08:44.000000000 +0300 @@ -856,6 +856,17 @@ } $$.len = strlen($$.buf); @@ -606,3 +706,81 @@ Index: ipsec-tools-cvs-HEAD/src/setkey/parse.y ; context_spec +Index: ipsec-tools-cvs-HEAD/src/racoon/racoonctl.8 +=================================================================== +--- ipsec-tools-cvs-HEAD.orig/src/racoon/racoonctl.8 2011-03-05 09:23:59.000000000 +0200 ++++ ipsec-tools-cvs-HEAD/src/racoon/racoonctl.8 2011-03-29 22:08:44.000000000 +0300 +@@ -158,8 +158,8 @@ + has the following format: + .Bl -tag -width Bl + .It isakmp {inet|inet6} Ar src Ar dst +-.It {esp|ah} {inet|inet6} Ar src/prefixlen/port Ar dst/prefixlen/port +-{icmp|tcp|udp|gre|any} ++.It {esp|ah} {inet|inet6} Ar src/prefixlen/port Ar dst/prefixlen/port \ ++ {icmp|tcp|udp|gre|any} Oo grekey Ar key Oc + .El + .It vpn-connect Oo Fl u Ar username Oc Ar vpn_gateway + This is a particular case of the previous command. +Index: ipsec-tools-cvs-HEAD/src/racoon/isakmp_quick.c +=================================================================== +--- ipsec-tools-cvs-HEAD.orig/src/racoon/isakmp_quick.c 2011-03-29 22:18:12.000000000 +0300 ++++ ipsec-tools-cvs-HEAD/src/racoon/isakmp_quick.c 2011-03-30 09:23:13.000000000 +0300 +@@ -2168,6 +2168,8 @@ + goto end; + } + ++ ipsecdoi_normalize_id_uldata(idsrc, iddst); ++ + #ifdef ENABLE_HYBRID + + /* clientaddr check : obtain modecfg address */ +@@ -2494,6 +2496,7 @@ + pref = spidx.prefs; + spidx.prefs = spidx.prefd; + spidx.prefd = pref; ++ spidx_normalize_ulports(&spidx); + + sp_out = getsp_r(&spidx); + if (!sp_out) { +Index: ipsec-tools-cvs-HEAD/src/racoon/policy.c +=================================================================== +--- ipsec-tools-cvs-HEAD.orig/src/racoon/policy.c 2011-03-30 08:03:15.000000000 +0300 ++++ ipsec-tools-cvs-HEAD/src/racoon/policy.c 2011-03-30 08:05:23.000000000 +0300 +@@ -444,6 +444,25 @@ + return new; + } + ++void ++spidx_normalize_ulports(spidx) ++ struct policyindex *spidx; ++{ ++ u_int16_t tmp; ++ ++ switch (spidx->ul_proto) { ++ case IPPROTO_ICMP: ++ case IPPROTO_ICMPV6: ++ case IPPROTO_GRE: ++ /* Ports are UL specific data, and should not get swapped */ ++ tmp = extract_port((struct sockaddr *) &spidx->src); ++ set_port((struct sockaddr *) &spidx->src, ++ extract_port((struct sockaddr *) &spidx->dst)); ++ set_port((struct sockaddr *) &spidx->dst, tmp); ++ break; ++ } ++} ++ + const char * + spidx2str(spidx) + const struct policyindex *spidx; +Index: ipsec-tools-cvs-HEAD/src/racoon/policy.h +=================================================================== +--- ipsec-tools-cvs-HEAD.orig/src/racoon/policy.h 2011-03-30 08:15:44.000000000 +0300 ++++ ipsec-tools-cvs-HEAD/src/racoon/policy.h 2011-03-30 08:16:21.000000000 +0300 +@@ -156,6 +156,7 @@ + extern void flushsp __P((void)); + extern void initsp __P((void)); + extern struct ipsecrequest *newipsecreq __P((void)); ++extern void spidx_normalize_ulports __P((struct policyindex *)); + + extern const char *spidx2str __P((const struct policyindex *)); + #ifdef HAVE_SECCTX diff --git a/main/ipsec-tools/APKBUILD b/main/ipsec-tools/APKBUILD index 6e8341cb87..130f2af644 100644 --- a/main/ipsec-tools/APKBUILD +++ b/main/ipsec-tools/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=ipsec-tools pkgver=0.8.0 -pkgrel=0 +pkgrel=2 pkgdesc="User-space IPsec tools for various IPsec implementations" url="http://ipsec-tools.sourceforge.net/" arch="all" @@ -58,7 +58,7 @@ package() { md5sums="c9a318cdbc0946f4e51464866d529739 ipsec-tools-0.8.0.tar.gz 74f12ed04ed273a738229c0bfbf829cc racoon.initd 2d00250cf72da7f2f559c91b65a48747 racoon.confd -64a859d51f57206a11e52f6ad4830ec5 20-grekey-support.patch +79b919ab23080f54dc3e7686877ca6bd 20-grekey-support.patch f97205eea3dc68d2437a2ad8720f4520 50-reverse-connect.patch 94773c94233e14cdce0fa02ff780a43e 70-defer-isakmp-ident-handling.patch 2d5d24c4a3684a38584f88720f71c7d6 75-racoonctl-rcvbuf.patch" diff --git a/main/lua/APKBUILD b/main/lua/APKBUILD index f6377dabce..cd6030d7fd 100644 --- a/main/lua/APKBUILD +++ b/main/lua/APKBUILD @@ -2,18 +2,19 @@ pkgname=lua pkgver=5.1.4_p3 _ver=${pkgver%_p*} -pkgrel=0 +pkgrel=1 pkgdesc="A powerful light-weight programming language designed for extending applications." url="http://www.lua.org/" arch="all" license="MIT" depends= -makedepends="readline-dev libtool" +makedepends="libtool" subpackages="$pkgname-dev $pkgname-doc" source="http://www.$pkgname.org/ftp/$pkgname-$_ver.tar.gz http://www.lua.org/ftp/patch-lua-5.1.4-${pkgver#*_p} lua-5.1-make.patch lua-5.1-module_paths.patch + lua-5.1-readline.patch " _builddir="$srcdir"/lua-$_ver @@ -38,7 +39,6 @@ build () cd src make CFLAGS=" -DLUA_USE_LINUX $CFLAGS" \ RPATH="/usr/lib" \ - LUA_LIBS="-lreadline" \ LIB_LIBS="-lpthread -lm -ldl" \ V=$pkgver \ gentoo_all || return 1 @@ -56,4 +56,5 @@ package() { md5sums="d0870f2de55d59c1c8419f36e8fac150 lua-5.1.4.tar.gz 998ef7886183f61d3a5ca891a9ce6a79 patch-lua-5.1.4-3 0145ff6036eb6bfdab427dc8f0c3f3c0 lua-5.1-make.patch -e60ef15deefb72a5930c498f1184aced lua-5.1-module_paths.patch" +e60ef15deefb72a5930c498f1184aced lua-5.1-module_paths.patch +f2205b897edb31292a1f597a7fd638cb lua-5.1-readline.patch" diff --git a/main/lua/lua-5.1-readline.patch b/main/lua/lua-5.1-readline.patch new file mode 100644 index 0000000000..f144861efb --- /dev/null +++ b/main/lua/lua-5.1-readline.patch @@ -0,0 +1,10 @@ +--- lua-5.1.1.orig/src/luaconf.h 2006-04-10 20:27:23.000000000 +0200 ++++ lua-5.1.1/src/luaconf.h 2006-11-15 14:53:07.000000000 +0100 +@@ -36,7 +36,6 @@ + #if defined(LUA_USE_LINUX) + #define LUA_USE_POSIX + #define LUA_USE_DLOPEN /* needs an extra library: -ldl */ +-#define LUA_USE_READLINE /* needs some extra libraries */ + #endif + + #if defined(LUA_USE_MACOSX) diff --git a/main/m4/APKBUILD b/main/m4/APKBUILD index 0f58750bb6..7216a43b7a 100644 --- a/main/m4/APKBUILD +++ b/main/m4/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=m4 -pkgver=1.4.15 +pkgver=1.4.16 pkgrel=0 pkgdesc="GNU macro processor" url="http://www.gnu.org/software/m4" @@ -9,12 +9,11 @@ arch="all" license="GPL" subpackages="m4-doc" source="ftp://ftp.gnu.org/gnu/m4/$pkgname-$pkgver.tar.gz - gnulib-uclibc.patch" + " _builddir="$srcdir"/$pkgname-$pkgver prepare() { cd "$_builddir" - patch -p1 -i "$srcdir"/gnulib-uclibc.patch } build() { @@ -28,5 +27,4 @@ package() { make install DESTDIR="$pkgdir" } -md5sums="5649a2e593b6c639deae9e72ede777dd m4-1.4.15.tar.gz -20a7dedec0e9e0ee7107e33e798ffdbe gnulib-uclibc.patch" +md5sums="a5dfb4f2b7370e9d34293d23fd09b280 m4-1.4.16.tar.gz" diff --git a/main/m4/gnulib-uclibc.patch b/main/m4/gnulib-uclibc.patch deleted file mode 100644 index 09775d6b18..0000000000 --- a/main/m4/gnulib-uclibc.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/lib/spawn.in.h b/lib/spawn.in.h -index 84ba93c..6df4599 100644 ---- a/lib/spawn.in.h -+++ b/lib/spawn.in.h -@@ -31,7 +31,7 @@ - - /* Get definitions of 'struct sched_param' and 'sigset_t'. - But avoid namespace pollution on glibc systems. */ --#ifndef __GLIBC__ -+#if !defined(__GLIBC__) || defined(__UCLIBC__) - # include <sched.h> - # include <signal.h> - #endif diff --git a/main/opennhrp/0001-netlink-ignore-kernel-routes-for-GRE-interfaces.patch b/main/opennhrp/0001-netlink-ignore-kernel-routes-for-GRE-interfaces.patch new file mode 100644 index 0000000000..78cf3f89b4 --- /dev/null +++ b/main/opennhrp/0001-netlink-ignore-kernel-routes-for-GRE-interfaces.patch @@ -0,0 +1,54 @@ +From 7747c86253114ed9702346a93587e4e6cac444aa Mon Sep 17 00:00:00 2001 +From: David Ward <david.ward@ll.mit.edu> +Date: Tue, 29 Mar 2011 22:43:03 -0400 +Subject: [PATCH] netlink: ignore kernel routes for GRE interfaces + +The kernel route should not be added as a peer, except on shortcut- +destination interfaces. It can prevent NHRP resolution requests from +being routed correctly to a statically-configured next hop server. + +Signed-off-by: David Ward <david.ward@ll.mit.edu> +--- + nhrp/sysdep_netlink.c | 9 ++++----- + 1 files changed, 4 insertions(+), 5 deletions(-) + +diff --git a/nhrp/sysdep_netlink.c b/nhrp/sysdep_netlink.c +index a76acc2..e3e588b 100644 +--- a/nhrp/sysdep_netlink.c ++++ b/nhrp/sysdep_netlink.c +@@ -691,7 +691,8 @@ static void netlink_route_new(struct nlmsghdr *msg) + } else if (iface->flags & NHRP_INTERFACE_FLAG_CONFIGURED) { + /* Routes which might get additional outbound + * shortcuts */ +- if (rtm->rtm_table != iface->route_table) ++ if (rtm->rtm_table != iface->route_table || ++ rtm->rtm_protocol == RTPROT_KERNEL) + return; + type = NHRP_PEER_TYPE_LOCAL_ROUTE; + } +@@ -728,12 +729,9 @@ static void netlink_route_del(struct nlmsghdr *msg) + if (rta[RTA_OIF] == NULL || rta[RTA_DST] == NULL) + return; + +- /* Consider only routes from main table */ + if (rtm->rtm_family != PF_INET) + return; + +- /* Only consider routes for local interfaces that accept +- * shortcut connections */ + iface = nhrp_interface_get_by_index(*(int*)RTA_DATA(rta[RTA_OIF]), + FALSE); + if (iface == NULL) +@@ -747,7 +745,8 @@ static void netlink_route_del(struct nlmsghdr *msg) + } else if (iface->flags & NHRP_INTERFACE_FLAG_CONFIGURED) { + /* Routes which might get additional outbound + * shortcuts */ +- if (rtm->rtm_table != iface->route_table) ++ if (rtm->rtm_table != iface->route_table || ++ rtm->rtm_protocol == RTPROT_KERNEL) + return; + type = NHRP_PEER_TYPE_LOCAL_ROUTE; + } +-- +1.7.1 + diff --git a/main/opennhrp/APKBUILD b/main/opennhrp/APKBUILD index 02dc7f6245..610fd53db6 100644 --- a/main/opennhrp/APKBUILD +++ b/main/opennhrp/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=opennhrp pkgver=0.12.1 -pkgrel=0 +pkgrel=1 pkgdesc="NBMA Next Hop Resolution Protocol daemon" url="http://sourceforge.net/projects/opennhrp" arch="all" @@ -10,6 +10,7 @@ depends= makedepends="c-ares-dev" subpackages="$pkgname-doc" source="http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2 + 0001-netlink-ignore-kernel-routes-for-GRE-interfaces.patch opennhrp-0.9.3-peer-up-bgp.patch $pkgname.initd $pkgname.confd @@ -33,6 +34,7 @@ package() { install -Dm644 "$srcdir"/opennhrp.confd "$pkgdir"/etc/conf.d/opennhrp } md5sums="31ada6dede3c62dac491002624d34778 opennhrp-0.12.1.tar.bz2 +d6dbf1ac009615cea63e0ede894133a0 0001-netlink-ignore-kernel-routes-for-GRE-interfaces.patch f81539fc92800bb79668dda119a97d1d opennhrp-0.9.3-peer-up-bgp.patch ae65f88ccf849ef882669a8b4f0c7fc0 opennhrp.initd 8eee86233728dc0d156bbfee6d98f338 opennhrp.confd" diff --git a/main/polkit/APKBUILD b/main/polkit/APKBUILD index 212ce5dbac..8e8fbe7e5a 100644 --- a/main/polkit/APKBUILD +++ b/main/polkit/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=polkit _pkgname=PolicyKit -pkgver=0.100 +pkgver=0.101 pkgrel=0 pkgdesc="Application development toolkit for controlling system-wide privileges" url="http://www.freedesktop.org/wiki/Software/PolicyKit" @@ -10,7 +10,7 @@ arch="all" license="LGPL" depends= makedepends="expat-dev glib-dev eggdbus-dev intltool dbus-glib-dev autoconf - libtool automake gtk-doc" + libtool automake gtk-doc gobject-introspection" depends_dev="eggdbus-dev dbus-glib-dev" install= subpackages="$pkgname-dev $pkgname-doc" @@ -34,6 +34,7 @@ build() { --disable-nls \ --disable-introspection \ --with-authfw=shadow \ + --with-os-type=alpine \ --disable-gtk-doc \ --disable-gtk-doc-html \ --disable-gtk-doc-pdf @@ -46,4 +47,4 @@ package() { make DESTDIR="$pkgdir" install } -md5sums="42a28c061d870d19308cb31197d8a7f5 PolicyKit-0.100.tar.bz2" +md5sums="dcacd0c68fc62d0199bd39e437ab4baf PolicyKit-0.101.tar.bz2" diff --git a/main/ppp/APKBUILD b/main/ppp/APKBUILD index 97439d042e..c3907106ca 100644 --- a/main/ppp/APKBUILD +++ b/main/ppp/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=ppp pkgver=2.4.5 -pkgrel=4 +pkgrel=6 pkgdesc="A daemon which implements the PPP protocol for dial-up networking" url="http://www.samba.org/ppp/" arch="all" @@ -21,6 +21,23 @@ source="ftp://ftp.samba.org/pub/$pkgname/$pkgname-$pkgver.tar.gz _builddir="$srcdir"/$pkgname-$pkgver build () { cd "$_builddir" + + # fix CFLAGS + # -D_GNU_SOURCE is needed for IPv6 to work apparently + export CFLAGS="$CFLAGS -D_GNU_SOURCE" + sed -i "s:-O2 -pipe -Wall -g:${CFLAGS}:" pppd/Makefile.linux + sed -i "s:-g -O2:${CFLAGS}:" pppd/plugins/Makefile.linux + sed -i "s:-O2:${CFLAGS}:" pppstats/Makefile.linux + sed -i "s:-O2 -g -pipe:${CFLAGS}:" chat/Makefile.linux + sed -i "s:-O:${CFLAGS}:" pppdump/Makefile.linux + # enable active filter + sed -i "s:^#FILTER=y:FILTER=y:" pppd/Makefile.linux + # enable ipv6 support + sed -i "s:^#HAVE_INET6=y:HAVE_INET6=y:" pppd/Makefile.linux + # Enable Microsoft proprietary Callback Control Protocol + sed -i "s:^#CBCP=y:CBCP=y:" pppd/Makefile.linux + # Fix build error with recent kernels + rm include/linux/if_pppol2tp.h ./configure --prefix=/usr make COPTS="$CFLAGS" || return 1 } diff --git a/main/readline/APKBUILD b/main/readline/APKBUILD index 65c825b246..7061eecc12 100644 --- a/main/readline/APKBUILD +++ b/main/readline/APKBUILD @@ -1,10 +1,10 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=readline -pkgver=6.1.002 +pkgver=6.2.001 _myver=${pkgver%.*} _patchver=${pkgver##*.} _suff=${_myver%.*}${_myver#*.} -pkgrel=2 +pkgrel=0 pkgdesc="GNU readline library" url="ftp://ftp.cwru.edu/pub/bash/" arch="all" @@ -47,6 +47,5 @@ package() { make DESTDIR="$pkgdir" install || return 1 } -md5sums="fc2f7e714fe792db1ce6ddc4c9fb4ef3 readline-6.1.tar.gz -c642f2e84d820884b0bf9fd176bc6c3f readline61-001 -1a76781a1ea734e831588285db7ec9b1 readline61-002" +md5sums="67948acb2ca081f23359d0256e9a271c readline-6.2.tar.gz +83287d52a482f790dfb30ec0a8746669 readline62-001" diff --git a/testing/burp/APKBUILD b/testing/burp/APKBUILD new file mode 100644 index 0000000000..e53320b19e --- /dev/null +++ b/testing/burp/APKBUILD @@ -0,0 +1,47 @@ +# Contributor: Natanael Copa <ncopa@alpinelinux.org> +# Maintainer: Natanael Copa <ncopa@alpinelinux.org> +pkgname=burp +pkgver=1.1.30 +pkgrel=0 +pkgdesc="Backup and resore program" +url="http://burp.grke.net/" +arch="all" +license="AGPLv3" +depends= +depends_dev="librsync-dev zlib-dev openssl-dev" +makedepends="$depends_dev gettext-dev" +install="" +subpackages="$pkgname-doc" +source="http://downloads.sourceforge.net/project/burp/burp-$pkgver/burp-$pkgver.tar.bz2" + +_builddir="$srcdir"/burp-$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 +# cd autoconf +# aclocal -I burp-macros && autoconf || return 1 +# cp configure ../ +} + +build() { + cd "$_builddir" + ./configure --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --infodir=/usr/share/info \ + --localstatedir=/var \ + || return 1 + make NO_ECHO= || return 1 +} + +package() { + cd "$_builddir" + make DESTDIR="$pkgdir" install || return 1 +} + +md5sums="b3cdc0d310d2c9e2656d36f311be4c66 burp-1.1.30.tar.bz2" diff --git a/testing/gnash/APKBUILD b/testing/gnash/APKBUILD new file mode 100644 index 0000000000..98cba19fdf --- /dev/null +++ b/testing/gnash/APKBUILD @@ -0,0 +1,68 @@ +# Contributor: William Pitcock <nenolod@dereferenced.org> +# Maintainer: William Pitcock <nenolod@dereferenced.org> +pkgname=gnash +pkgver=0.8.9 +pkgrel=2 +pkgdesc="GNU flash player implementation" +url="http://www.gnashdev.org/" +arch="all" +license="GPL" +depends= +depends_dev="agg-dev cairo-dev gstreamer-dev gst-plugins-base-dev + ffmpeg-dev mesa-dev gtk+-dev sdl-dev boost-dev giflib-dev + speex-dev libxml2-dev jpeg-dev xulrunner-dev gtkglext-dev + curl-dev" +makedepends="$depends_dev libtool" +install="" +subpackages="$pkgname-doc $pkgname-dev $pkgname-mozilla $pkgname-sdl $pkgname-fb" +source="http://mirrors.igsobe.com/gnu/gnash/$pkgver/gnash-$pkgver.tar.gz + gnash-ffmpeg.patch" + +_builddir="$srcdir"/gnash-$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 \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --infodir=/usr/share/info \ + --localstatedir=/var \ + || return 1 + make || return 1 +} + +package() { + cd "$_builddir" + make DESTDIR="$pkgdir" install || return 1 +} + +sdl() { + pkgdesc="$pkgdesc (sdl player)" + mkdir -p "$subpkgdir"/usr/bin + mv "$pkgdir"/usr/bin/sdl-gnash "$subpkgdir"/usr/bin +} + +fb() { + pkgdesc="$pkgdesc (framebuffer player)" + mkdir -p "$subpkgdir"/usr/bin + mv "$pkgdir"/usr/bin/fb-gnash "$subpkgdir"/usr/bin +} + +mozilla() { + depends="gnash" + pkgdesc="$pkgdesc (mozilla plugin)" + mkdir -p "$subpkgdir"/usr/lib/mozilla/plugins + mv "$_builddir"/plugin/npapi/.libs/libgnashplugin.so "$subpkgdir"/usr/lib/mozilla/plugins +} + +md5sums="01d0420932eede07211e368d405aee9c gnash-0.8.9.tar.gz +b324b3fee1e017d8fcc4d991146266f8 gnash-ffmpeg.patch" diff --git a/testing/gnash/gnash-ffmpeg.patch b/testing/gnash/gnash-ffmpeg.patch new file mode 100644 index 0000000000..dc78e81c59 --- /dev/null +++ b/testing/gnash/gnash-ffmpeg.patch @@ -0,0 +1,24 @@ +--- gnash-0.8.9.orig/libmedia/ffmpeg/MediaParserFfmpeg.cpp ++++ gnash-0.8.9/libmedia/ffmpeg/MediaParserFfmpeg.cpp +@@ -52,8 +52,8 @@ + return p->readPacket(buf, buf_size); + } + +-boost::int64_t +-MediaParserFfmpeg::seekMediaWrapper(void *opaque, boost::int64_t offset, int whence) ++::int64_t ++MediaParserFfmpeg::seekMediaWrapper(void *opaque, ::int64_t offset, int whence) + { + MediaParserFfmpeg* p = static_cast<MediaParserFfmpeg*>(opaque); + return p->seekMedia(offset, whence); +--- gnash-0.8.9.orig/libmedia/ffmpeg/MediaParserFfmpeg.h ++++ gnash-0.8.9/libmedia/ffmpeg/MediaParserFfmpeg.h +@@ -126,7 +126,7 @@ + boost::int64_t seekMedia(boost::int64_t offset, int whence); + + /// ffmpeg callback function +- static boost::int64_t seekMediaWrapper(void *opaque, boost::int64_t offset, int whence); ++ static int64_t seekMediaWrapper(void *opaque, int64_t offset, int whence); + + /// Read some of the input to figure an AVInputFormat + AVInputFormat* probeStream(); diff --git a/testing/pureftpd/APKBUILD b/testing/pureftpd/APKBUILD new file mode 100644 index 0000000000..8a5110df7b --- /dev/null +++ b/testing/pureftpd/APKBUILD @@ -0,0 +1,49 @@ +# Contributor: Douglas Haber <me@douglashaber.com> +# Maintainer: Natanael Copa <ncopa@alpinelinux.org> +pkgname=pure-ftpd +pkgver=1.0.30 +pkgrel=1 +pkgdesc="Pure FTPD FTP daemon" +url="http://pureftpd.org" +arch="all" +license="GPL" +depends= +depends_dev= +makedepends="$depends_dev" +install="" +subpackages="" +source="http://download.pureftpd.org/pub/pure-ftpd/releases/$pkgname-$pkgver.tar.gz + pure-ftpd.initd" + +_builddir="src/$pkgname-$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 \ + --without-humor \ + --without-unicode \ + --with-minimal \ + --with-throttling \ + || return 1 + make || return 1 +} + +package() { + cd "$_builddir" + make DESTDIR="$pkgdir" install || return 1 + install -m755 -D ../$pkgname.initd \ + "$pkgdir"/etc/init.d/$pkgname || return 1 + +} + +md5sums="29e2a68e756d09f4aff8f4f76435b020 pure-ftpd-1.0.30.tar.gz +a37d043f3df4595b2d39aa1083705948 pure-ftpd.initd" diff --git a/testing/pureftpd/pure-ftpd.initd b/testing/pureftpd/pure-ftpd.initd new file mode 100644 index 0000000000..ea55116e69 --- /dev/null +++ b/testing/pureftpd/pure-ftpd.initd @@ -0,0 +1,26 @@ +#!/sbin/runscript + +name=pure-ftpd +daemon=/usr/sbin/$name + +depend() { + need net + after firewall +} + +start() { + ebegin "Starting ${name}" + start-stop-daemon --start --quiet \ + --pidfile /var/run/${name}.pid \ + --exec ${daemon} --background + eend $? +} + +stop() { + ebegin "Stopping ${name}" + start-stop-daemon --stop --quiet \ + --pidfile /var/run/$name.pid \ + --exec ${daemon} + eend $? +} + |