summaryrefslogtreecommitdiffstats
path: root/main
diff options
context:
space:
mode:
Diffstat (limited to 'main')
-rw-r--r--main/dahdi-linux-grsec/APKBUILD2
-rw-r--r--main/ipsec-tools/APKBUILD8
-rw-r--r--main/ipsec-tools/initial-contact-fix.diff71
-rw-r--r--main/iscsitarget-grsec/APKBUILD2
-rw-r--r--main/kqemu-grsec/APKBUILD2
-rw-r--r--main/linux-grsec/APKBUILD4
-rw-r--r--main/pingu/APKBUILD8
-rw-r--r--main/pingu/commit-queue1
-rw-r--r--main/squid/APKBUILD7
-rw-r--r--main/xtables-addons-grsec/APKBUILD2
10 files changed, 91 insertions, 16 deletions
diff --git a/main/dahdi-linux-grsec/APKBUILD b/main/dahdi-linux-grsec/APKBUILD
index 36e91f79..079bee34 100644
--- a/main/dahdi-linux-grsec/APKBUILD
+++ b/main/dahdi-linux-grsec/APKBUILD
@@ -14,7 +14,7 @@ _realname=dahdi-linux
pkgname=${_realname}-${_flavor}
pkgver=2.2.0
-pkgrel=19
+pkgrel=20
pkgdesc="Digium Asterisk Hardware Device Interface drivers"
url="http://www.asterisk.org"
license="GPL"
diff --git a/main/ipsec-tools/APKBUILD b/main/ipsec-tools/APKBUILD
index ef2e2492..0f1e4a2f 100644
--- a/main/ipsec-tools/APKBUILD
+++ b/main/ipsec-tools/APKBUILD
@@ -2,7 +2,7 @@
pkgname=ipsec-tools
pkgver=0.8_alpha20090903
_myver=0.8-alpha20090903
-pkgrel=2
+pkgrel=4
pkgdesc="User-space IPsec tools for various IPsec implementations"
url="http://ipsec-tools.sourceforge.net/"
license="BSD"
@@ -14,6 +14,7 @@ source="http://downloads.sourceforge.net/$pkgname/$pkgname-$_myver.tar.gz
racoon.confd
50-reverse-connect.patch
60-debug-quick.patch
+ initial-contact-fix.diff
"
build() {
@@ -22,6 +23,8 @@ build() {
msg "Applying $i..."
patch -p1 -i $i || return 1
done
+ patch -p0 -i "$srcdir"/initial-contact-fix.diff || return 1
+
sed -i 's:-Werror::g' configure
./configure --prefix=/usr \
@@ -48,4 +51,5 @@ md5sums="8ec28d4e89c0f5e49ae2caa7463fbcfd ipsec-tools-0.8-alpha20090903.tar.gz
860e8ca1d8c793dc3055b94fd88f02a3 racoon.initd
2d00250cf72da7f2f559c91b65a48747 racoon.confd
13bda94a598aabf593280e04ea16065d 50-reverse-connect.patch
-baa13d7f0f48955c792f7fcd42a8587a 60-debug-quick.patch"
+baa13d7f0f48955c792f7fcd42a8587a 60-debug-quick.patch
+69e06c5cc3a0c1cc8b10ddc89d1e644b initial-contact-fix.diff"
diff --git a/main/ipsec-tools/initial-contact-fix.diff b/main/ipsec-tools/initial-contact-fix.diff
new file mode 100644
index 00000000..370418be
--- /dev/null
+++ b/main/ipsec-tools/initial-contact-fix.diff
@@ -0,0 +1,71 @@
+Index: src/racoon/admin.c
+===================================================================
+RCS file: /cvsroot/src/crypto/dist/ipsec-tools/src/racoon/admin.c,v
+retrieving revision 1.32
+diff -u -r1.32 admin.c
+--- src/racoon/admin.c 3 Sep 2009 09:29:07 -0000 1.32
++++ src/racoon/admin.c 10 Dec 2009 14:38:47 -0000
+@@ -299,9 +299,8 @@
+ break;
+
+ case ADMIN_DELETE_SA: {
+- struct ph1handle *iph1;
+- struct ph1selector sel;
+ char *loc, *rem;
++ struct ph1selector sel;
+
+ memset(&sel, 0, sizeof(sel));
+ sel.local = (struct sockaddr *)
+@@ -319,6 +318,7 @@
+ plog(LLV_INFO, LOCATION, NULL,
+ "admin delete-sa %s %s\n", loc, rem);
+ enumph1(&sel, admin_ph1_delete_sa, NULL);
++ remcontacted(sel.remote);
+
+ racoon_free(loc);
+ racoon_free(rem);
+Index: src/racoon/handler.c
+===================================================================
+RCS file: /cvsroot/src/crypto/dist/ipsec-tools/src/racoon/handler.c,v
+retrieving revision 1.31
+diff -u -r1.31 handler.c
+--- src/racoon/handler.c 22 Nov 2009 19:34:55 -0000 1.31
++++ src/racoon/handler.c 10 Dec 2009 14:38:48 -0000
+@@ -966,6 +966,22 @@
+ }
+
+ void
++remcontacted(remote)
++ struct sockaddr *remote;
++{
++ struct contacted *p;
++
++ LIST_FOREACH(p, &ctdtree, chain) {
++ if (cmpsaddr(remote, p->remote) == 0) {
++ LIST_REMOVE(p, chain);
++ racoon_free(p->remote);
++ racoon_free(p);
++ break;
++ }
++ }
++}
++
++void
+ initctdtree()
+ {
+ LIST_INIT(&ctdtree);
+Index: src/racoon/handler.h
+===================================================================
+RCS file: /cvsroot/src/crypto/dist/ipsec-tools/src/racoon/handler.h,v
+retrieving revision 1.22
+diff -u -r1.22 handler.h
+--- src/racoon/handler.h 3 Sep 2009 09:29:07 -0000 1.22
++++ src/racoon/handler.h 10 Dec 2009 14:38:48 -0000
+@@ -518,6 +518,7 @@
+
+ extern struct contacted *getcontacted __P((struct sockaddr *));
+ extern int inscontacted __P((struct sockaddr *));
++extern void remcontacted __P((struct sockaddr *));
+ extern void initctdtree __P((void));
+
+ extern int check_recvdpkt __P((struct sockaddr *,
diff --git a/main/iscsitarget-grsec/APKBUILD b/main/iscsitarget-grsec/APKBUILD
index 51c176b8..76179e52 100644
--- a/main/iscsitarget-grsec/APKBUILD
+++ b/main/iscsitarget-grsec/APKBUILD
@@ -15,7 +15,7 @@ if [ -f ../iscsitarget/APKBUILD ]; then
fi
pkgname=${_realname}-${_flavor}
pkgver=${pkgver:-0.4.17}
-pkgrel=17
+pkgrel=18
pkgdesc="$_flavor kernel modules for iscsitarget"
url="http://iscsitarget.sourceforge.net/"
license="GPL-2"
diff --git a/main/kqemu-grsec/APKBUILD b/main/kqemu-grsec/APKBUILD
index b9527fa8..23cd0475 100644
--- a/main/kqemu-grsec/APKBUILD
+++ b/main/kqemu-grsec/APKBUILD
@@ -12,7 +12,7 @@ _abi_release=$pkgver-${_flavor}
pkgname=${_realname}-${_flavor}
pkgver=1.4.0_pre1
_realver=1.4.0pre1
-pkgrel=10
+pkgrel=11
pkgdesc="$_flavor kernel modules for kemu"
url="http://www.nongnu.org/qemu/"
license="GPL"
diff --git a/main/linux-grsec/APKBUILD b/main/linux-grsec/APKBUILD
index 31eaf892..d8427cd9 100644
--- a/main/linux-grsec/APKBUILD
+++ b/main/linux-grsec/APKBUILD
@@ -2,7 +2,7 @@
_flavor=grsec
pkgname=linux-${_flavor}
-pkgver=2.6.30.8
+pkgver=2.6.30.10
_kernver=2.6.30
pkgrel=0
pkgdesc="Linux kernel with grsecurity"
@@ -120,7 +120,7 @@ firmware() {
}
md5sums="7a80058a6382e5108cdb5554d1609615 linux-2.6.30.tar.bz2
-7e9b405b840bf5ecc70d208bfccee5f9 patch-2.6.30.8.bz2
+6485fe0cf0f0220493647505bfd2f7b0 patch-2.6.30.10.bz2
287a382cfb72043867d8092996875f5d grsecurity-2.1.14-2.6.30.8-200909262311.patch
ca05fd252783b82e01610e775cf56498 net-next-2.6.git-5ef12d98a19254ee5dc851bd83e214b43ec1f725.patch
9f41d910914f5a516072f0aa500fa117 kernelconfig"
diff --git a/main/pingu/APKBUILD b/main/pingu/APKBUILD
index ae392712..a7a9992e 100644
--- a/main/pingu/APKBUILD
+++ b/main/pingu/APKBUILD
@@ -1,8 +1,8 @@
# Contributor: Natanael Copa <ncopa@alpinelinux.org>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=pingu
-pkgver=0.3
-pkgrel=3
+pkgver=0.4.1
+pkgrel=0
pkgdesc="Small daemon that pings hosts and executes a script when status change"
url="http://git.alpinelinux.org/cgit/pingu"
license="GPL"
@@ -16,9 +16,9 @@ build() {
make || return 1
make BINDIR=/usr/sbin DESTDIR="$pkgdir" install
- install -m644 -D pingu.conf "$pkgdir"/etc/pingu.conf
+ install -m644 -D pingu.conf "$pkgdir"/etc/pingu/pingu.conf
install -m755 -D "$srcdir"/$pkgname.initd "$pkgdir"/etc/init.d/$pkgname
}
-md5sums="59f9c927a80c71d85f2363e314a25197 pingu-0.3.tar.bz2
+md5sums="257abb7c434ae2cda5c029c30584aa88 pingu-0.4.1.tar.bz2
318110763cc8ba23a61455d16cb23f97 pingu.initd"
diff --git a/main/pingu/commit-queue b/main/pingu/commit-queue
deleted file mode 100644
index d4bd0e41..00000000
--- a/main/pingu/commit-queue
+++ /dev/null
@@ -1 +0,0 @@
-pingu
diff --git a/main/squid/APKBUILD b/main/squid/APKBUILD
index 66be7961..fa13a0ab 100644
--- a/main/squid/APKBUILD
+++ b/main/squid/APKBUILD
@@ -3,7 +3,7 @@
pkgname=squid
pkgver=2.7.7
_ver=2.7.STABLE7
-pkgrel=0
+pkgrel=2
pkgdesc="A full-featured Web proxy cache server."
url="http://www.squid-cache.org"
install="squid.pre-install squid.pre-upgrade squid.post-install"
@@ -74,7 +74,7 @@ build() {
--enable-removal-policies="lru,heap" \
--enable-digest-auth-helpers="password" \
--enable-storeio="aufs,ufs,diskd,coss,null" \
- --enable-basic-auth-helpers="getpwnam,NCSA,SMB,MSNT,multi-domain-NTLM" \
+ --enable-basic-auth-helpers="getpwnam,NCSA,SMB,MSNT,multi-domain-NTLM,squid_radius_auth" \
--enable-external-acl-helpers="ip_user,unix_group,wbinfo_group" \
--enable-ntlm-auth-helpers="SMB,fakeauth,no_check" \
--enable-delay-pools --enable-arp-acl --enable-ssl \
@@ -82,7 +82,8 @@ build() {
--enable-useragent-log --enable-cache-digests --enable-referer-log \
--enable-async-io --enable-truncate --enable-arp-acl \
--enable-htcp --enable-carp --enable-poll --with-maxfd=4096 \
- --enable-follow-x-forwarded-for
+ --enable-follow-x-forwarded-for \
+ --with-large-files
make || return 1
make DESTDIR="$pkgdir" install
diff --git a/main/xtables-addons-grsec/APKBUILD b/main/xtables-addons-grsec/APKBUILD
index f068a9b6..1839ec1c 100644
--- a/main/xtables-addons-grsec/APKBUILD
+++ b/main/xtables-addons-grsec/APKBUILD
@@ -16,7 +16,7 @@ fi
pkgname=${_realname}-${_flavor}
pkgver=${pkgver:-1.17}
-pkgrel=15
+pkgrel=16
pkgdesc="Iptables extensions kernel modules"
url="http://xtables-addons.sourceforge.net/"
license="GPL"
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-24 08:05:36 +0000