summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Manison <amanison@anselsystems.com>2010-04-19 10:38:50 +0000
committerAndrew Manison <amanison@anselsystems.com>2010-04-19 10:38:50 +0000
commit6b9044eb7969664e8d617131f92639da36d76f09 (patch)
treea0699bc81316acd129cfb82545417a9128c4c956
parent73790bcc09efb8d3862e18f303771108edfbf2a3 (diff)
parentd91daf05b6af2c1c885295395132428c20816a21 (diff)
downloadaports-6b9044eb7969664e8d617131f92639da36d76f09.tar.bz2
aports-6b9044eb7969664e8d617131f92639da36d76f09.tar.xz
Merge remote branch 'alpine/master'
-rw-r--r--main/djbdns/APKBUILD28
-rw-r--r--main/djbdns/dnscache.confd2
-rwxr-xr-xmain/djbdns/dnscache.initd4
-rwxr-xr-xmain/djbdns/dnscache.monthly48
-rwxr-xr-xmain/djbdns/tinydns.initd4
-rw-r--r--main/linux-grsec/APKBUILD6
-rw-r--r--main/squid/APKBUILD14
-rw-r--r--main/squid/squid-2-heimdal.patch18
8 files changed, 109 insertions, 15 deletions
diff --git a/main/djbdns/APKBUILD b/main/djbdns/APKBUILD
index cfb710055..a9895c23a 100644
--- a/main/djbdns/APKBUILD
+++ b/main/djbdns/APKBUILD
@@ -1,12 +1,12 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=djbdns
pkgver=1.05
-pkgrel=32
+pkgrel=33
pkgdesc="Excellent high-performance DNS services"
url="http://cr.yp.to/djbdns.html"
license="public-domain"
depends=
-subpackages="tinydns dnscache"
+subpackages="djbdns-common tinydns dnscache"
source="http://cr.yp.to/djbdns/$pkgname-$pkgver.tar.gz
headtail.patch
dnsroots.patch
@@ -20,6 +20,7 @@ source="http://cr.yp.to/djbdns/$pkgname-$pkgver.tar.gz
dnscache.pre-install
dnscache.initd
dnscache.confd
+ dnscache.monthly
"
build() {
@@ -44,9 +45,19 @@ build() {
mkdir -p "$pkgdir"/usr/share/doc/djbdns
}
+common() {
+ pkgdesc="Base utilities of djbdns"
+ replaces="djbdns"
+
+ mkdir -p "$subpkgdir"/usr/bin
+ mv "$pkgdir"/usr/bin/dnsq "$subpkgdir"/usr/bin
+ mv "$pkgdir"/usr/bin/dnsip "$subpkgdir"/usr/bin
+}
+
tinydns() {
pkgdesc="A small and secure DNS server"
install=tinydns.pre-install
+
mkdir -p "$subpkgdir"/usr/bin "$subpkgdir"/etc/tinydns \
"$subpkgdir"/var/cache/tinydns
mv "$pkgdir"/usr/bin/tinydns* "$subpkgdir"/usr/bin
@@ -59,6 +70,8 @@ tinydns() {
dnscache() {
pkgdesc="A recursive resolver"
install=dnscache.pre-install
+ depends=djbdns-common
+
mkdir -p "$subpkgdir"/usr/bin \
"$subpkgdir"/etc/dnscache/ip \
"$subpkgdir"/etc/dnscache/servers
@@ -71,8 +84,10 @@ dnscache() {
"$subpkgdir"/etc/init.d/dnscache
install -D -m644 "$srcdir"/dnscache.confd \
"$subpkgdir"/etc/conf.d/dnscache
+ install -D -m755 "$srcdir"/dnscache.monthly \
+ "$subpkgdir"/etc/periodic/monthly/dnscache-hints-refresh
}
-
+
md5sums="3147c5cd56832aa3b41955c7a51cbeb2 djbdns-1.05.tar.gz
0d2adaf9f1626043e8702b825cdccdd6 headtail.patch
7565048ebc981238879122c7f88cc143 dnsroots.patch
@@ -81,8 +96,9 @@ adb6745606cae593eb5ea6870fc27bd4 djbdns-1.05-jumbo-josb.patch
c7be73fe2fb4ae02d5096fa2c1f55a68 1.05-errno.patch
1292500c04baba3995d9753fe40fdc94 1.05-response.patch
7695bf50559c09798ec852b578ac8698 tinydns.pre-install
-3f4cd61c41f760c3007a8b09a4da091f tinydns.initd
+fe48165a920cf843ceb9a4ee50bf74c0 tinydns.initd
7dcf6674c07d46c736b3c25d9c92384a tinydns.confd
e09c3a6ba6917e16f4736ab5c070dbe9 dnscache.pre-install
-ec15af30819b9e146f86223753b367a0 dnscache.initd
-e2938593277d7a87806e70e145a90c3f dnscache.confd"
+e5cada3b032da84c4a0e41ef8b3108cb dnscache.initd
+2b3d02e88f70603c760bf368ab3ed636 dnscache.confd
+6253f44f042fc5aa31fd182780d9853c dnscache.monthly"
diff --git a/main/djbdns/dnscache.confd b/main/djbdns/dnscache.confd
index f456bf8db..e5312812c 100644
--- a/main/djbdns/dnscache.confd
+++ b/main/djbdns/dnscache.confd
@@ -20,4 +20,6 @@ IP=127.0.0.1
# FORWARDONLY - servers/@ are parent caches, not root servers
#FORWARDONLY=
+# UPDATEHINTS - refresh zone hints
+UPDATEHINTS=1
diff --git a/main/djbdns/dnscache.initd b/main/djbdns/dnscache.initd
index 3e88e3a42..37d9d9ba7 100755
--- a/main/djbdns/dnscache.initd
+++ b/main/djbdns/dnscache.initd
@@ -17,8 +17,8 @@ depend() {
# Main program
start() {
- UID=$( grep dnscache /etc/passwd | cut -f3 -d: )
- GID=$( grep dnscache /etc/group | cut -f3 -d: )
+ UID=$(id -u dnscache)
+ GID=$(id -g dnscache)
ebegin "Starting dnscache"
if [ -z "$UID" ] || [ -z "$GID" ]; then
diff --git a/main/djbdns/dnscache.monthly b/main/djbdns/dnscache.monthly
new file mode 100755
index 000000000..0bd5a8539
--- /dev/null
+++ b/main/djbdns/dnscache.monthly
@@ -0,0 +1,48 @@
+#!/bin/sh
+
+if [ -f ./etc/conf.d/dnscache ]; then
+ . /etc/conf.d/dnscache
+fi
+
+if [ -z "$UPDATEHINTS" ]; then
+ exit 0
+fi
+
+cd /etc/dnscache/servers
+NEEDRESTART=
+ZONES=`ls /etc/dnscache/servers`
+for ZONEFILE in $ZONES; do
+ # Convert symlinks to copies, so we can update it
+ ZONE="$ZONEFILE"
+ if [ -L $ZONEFILE ]; then
+ DST="`readlink "$ZONEFILE"`"
+ cp -f "$DST" "$ZONEFILE"
+ fi
+
+ if [ "$ZONE" == "@" ]; then
+ ZONE="."
+ fi
+
+ if [ "$ZONE" != "." -o "$FORWARDONLY" = "" ]; then
+ TMPF=`mktemp -t`
+
+ # Refresh zone info
+ dnsqr ns $ZONE | awk '/^answer: ./ { print $5 }' | sort -u | xargs dnsip > $TMPF
+
+ grep "^$" $TMPF 1> /dev/null
+ if [ $? != 0 ]; then
+ cmp -s $ZONEFILE $TMPF
+ if [ "$?" != 0 ]; then
+ NEEDRESTART=yes
+ cat $TMPF > $ZONEFILE
+ fi
+ fi
+ rm $TMPF
+ fi
+done
+
+if [ "$NEEDRESTART" ] && /etc/init.d/dnscache --quiet status; then
+ /etc/init.d/dnscache restart
+fi
+
+exit 0
diff --git a/main/djbdns/tinydns.initd b/main/djbdns/tinydns.initd
index ab15ffe37..8dfc53930 100755
--- a/main/djbdns/tinydns.initd
+++ b/main/djbdns/tinydns.initd
@@ -29,8 +29,8 @@ fi
# Main program
reload() {
local rc opwd="$opwd"
- UID=$( grep tinydns /etc/passwd | cut -f3 -d: )
- GID=$( grep tinydns /etc/group | cut -f3 -d: )
+ UID=$(id -u tinydns)
+ GID=$(id -g tinydns)
# Create the $ROOT directory if necessary
if [ ! -d "$ROOT" ]; then
diff --git a/main/linux-grsec/APKBUILD b/main/linux-grsec/APKBUILD
index b514a1a5d..759d6716e 100644
--- a/main/linux-grsec/APKBUILD
+++ b/main/linux-grsec/APKBUILD
@@ -55,7 +55,7 @@ prepare() {
mkdir -p "$srcdir"/build
cp "$srcdir"/$_config "$srcdir"/build/.config
- make -C "$srcdir"/linux-$_kernver O="$srcdir"/build HOSTCC="$CC" \
+ make -C "$srcdir"/linux-$_kernver O="$srcdir"/build HOSTCC="${CC:-gcc}" \
silentoldconfig
}
@@ -68,7 +68,7 @@ menuconfig() {
build() {
cd "$srcdir"/build
- make CC="$CC" || return 1
+ make CC="${CC:--gcc}" || return 1
}
package() {
@@ -99,7 +99,7 @@ dev() {
# external modules, and create the scripts
mkdir -p "$dir"
cp "$srcdir"/$_config "$dir"/.config
- make -j1 -C "$srcdir"/linux-$_kernver O="$dir" HOSTCC="$CC" \
+ make -j1 -C "$srcdir"/linux-$_kernver O="$dir" HOSTCC="${CC:-gcc}" \
silentoldconfig prepare scripts
# remove the stuff that poits to real sources. we want 3rd party
diff --git a/main/squid/APKBUILD b/main/squid/APKBUILD
index fa13a0ab5..e0f6582fe 100644
--- a/main/squid/APKBUILD
+++ b/main/squid/APKBUILD
@@ -3,7 +3,7 @@
pkgname=squid
pkgver=2.7.7
_ver=2.7.STABLE7
-pkgrel=2
+pkgrel=3
pkgdesc="A full-featured Web proxy cache server."
url="http://www.squid-cache.org"
install="squid.pre-install squid.pre-upgrade squid.post-install"
@@ -11,8 +11,9 @@ pkgusers="squid"
pkggroups="squid"
license="GPL-2"
depends="$pkgname-errors-english logrotate"
-makedepends="openssl-dev perl-dev autoconf automake"
+makedepends="openssl-dev perl-dev autoconf automake heimdal-dev"
subpackages="$pkgname-doc
+ squid_kerb_auth
$pkgname-errors-armenian:errors_armenian
$pkgname-errors-azerbaijani:errors_azerbaijani
$pkgname-errors-bulgarian:errors_bulgarian
@@ -52,6 +53,7 @@ source="http://www.squid-cache.org/Versions/v2/2.7/${pkgname}-${_ver}.tar.bz2
squid.initd
squid.confd
squid-2.7-gentoo.patch
+ squid-2-heimdal.patch
squid-2.7-ims-content-type.patch
$pkgname.logrotate
"
@@ -63,6 +65,7 @@ build() {
patch -p1 -i "$srcdir"/squid-2.7-gentoo.patch || return 1
patch -p1 -i "$srcdir"/squid-2.7-ims-content-type.patch || return 1
+ patch -p1 -i "$srcdir"/squid-2-heimdal.patch || return 1
touch NEWS AUTHORS
aclocal && autoconf && automake -a || return 1
@@ -77,6 +80,7 @@ build() {
--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-negotiate-auth-helpers="squid_kerb_auth" \
--enable-delay-pools --enable-arp-acl --enable-ssl \
--enable-linux-netfilter --enable-ident-lookups \
--enable-useragent-log --enable-cache-digests --enable-referer-log \
@@ -100,6 +104,11 @@ build() {
chmod +x "$pkgdir"/usr/lib/squid/*
}
+squid_kerb_auth() {
+ pkgdesc="Squid kerberos authetication helper"
+ install -d "$subpkgdir"/usr/lib/squid
+ mv "$pkgdir"/usr/lib/squid/squid_kerb_auth "$subpkgdir"/usr/lib/squid/
+}
_mv_error() {
local d=usr/share/squid/errors
@@ -285,5 +294,6 @@ md5sums="c18b0371fca813d5e7c7e0baf87baa22 squid-2.7.STABLE7.tar.bz2
57fed05adc40acab6a5480ec7a014154 squid.initd
44b052db7910f386ef88ddcf69c9ba4e squid.confd
3827f71d940b47eb385a1a1d92a51d66 squid-2.7-gentoo.patch
+614b97126ad9eecf728095f2de63d33d squid-2-heimdal.patch
549377b5a6b673bf19ea6c34003d122c squid-2.7-ims-content-type.patch
58823e0b86bc2dc71d270208b7b284b4 squid.logrotate"
diff --git a/main/squid/squid-2-heimdal.patch b/main/squid/squid-2-heimdal.patch
new file mode 100644
index 000000000..67500ae6a
--- /dev/null
+++ b/main/squid/squid-2-heimdal.patch
@@ -0,0 +1,18 @@
+diff -Nru squid-2.7.STABLE6.orig/helpers/negotiate_auth/squid_kerb_auth/Makefile.am squid-2.7.STABLE6/helpers/negotiate_auth/squid_kerb_auth/Makefile.am
+--- squid-2.7.STABLE6.orig/helpers/negotiate_auth/squid_kerb_auth/Makefile.am 2007-05-14 23:36:29.000000000 +0000
++++ squid-2.7.STABLE6/helpers/negotiate_auth/squid_kerb_auth/Makefile.am 2009-02-16 23:26:28.000000000 +0000
+@@ -18,10 +18,10 @@
+ #-L$(top_builddir)/lib -lmiscutil $(XTRA_LIBS)
+
+ # HEIMDAL
+-#KERBINC = -DHEIMDAL -I/usr/include/heimdal
+-#KERBLIBS = -lgssapi -lkrb5 -lcom_err -lasn1 -lroken
++KERBINC = -DHEIMDAL -I/usr/include/heimdal
++KERBLIBS = -lgssapi -lkrb5 -lcom_err -lasn1 -lroken
+
+ # MIT
+-KERBINC =
+-KERBLIBS = -lgssapi_krb5 -lkrb5 -lcom_err
++#KERBINC =
++#KERBLIBS = -lgssapi_krb5 -lkrb5 -lcom_err
+