summaryrefslogtreecommitdiff
path: root/core
diff options
context:
space:
mode:
Diffstat (limited to 'core')
-rw-r--r--core/dash/PKGBUILD8
-rw-r--r--core/heirloom-mailx/PKGBUILD10
-rw-r--r--core/iptables/PKGBUILD56
-rw-r--r--core/iptables/empty-filter.rules6
-rw-r--r--core/iptables/empty-mangle.rules8
-rw-r--r--core/iptables/empty-nat.rules7
-rw-r--r--core/iptables/empty-raw.rules5
-rw-r--r--core/iptables/empty-security.rules6
-rwxr-xr-xcore/iptables/ip6tables38
-rwxr-xr-xcore/iptables/iptables31
-rw-r--r--core/iptables/iptables.conf.d14
-rw-r--r--core/krb5/PKGBUILD20
-rw-r--r--core/krb5/krb5-1.9.1-config-script.patch25
-rw-r--r--core/libedit/PKGBUILD19
-rw-r--r--core/openldap/PKGBUILD18
-rwxr-xr-xcore/openldap/slapd1
-rw-r--r--core/procps/PKGBUILD80
-rw-r--r--core/procps/procps-3.2.8-gmake-3.82.patch14
-rw-r--r--core/procps/procps-3.2.8-kernel3-uts.patch20
19 files changed, 230 insertions, 156 deletions
diff --git a/core/dash/PKGBUILD b/core/dash/PKGBUILD
index 578f4b17f..8105f73a3 100644
--- a/core/dash/PKGBUILD
+++ b/core/dash/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 105861 2011-01-13 15:23:08Z stephane $
+# $Id: PKGBUILD 132155 2011-07-21 15:03:34Z dan $
# Maintainer: Dan McGee <dan@archlinux.org>
pkgname=dash
-pkgver=0.5.6.1
-pkgrel=2
+pkgver=0.5.7
+pkgrel=1
pkgdesc="A POSIX compliant shell that aims to be as small as possible"
arch=('i686' 'x86_64')
url="http://gondor.apana.org.au/~herbert/dash/"
@@ -11,7 +11,7 @@ license=('BSD')
groups=('base')
depends=('glibc')
source=("http://gondor.apana.org.au/~herbert/dash/files/${pkgname}-${pkgver}.tar.gz")
-md5sums=('1c846f4f5a33c0050b2045a6f7037e56')
+sha1sums=('a3ebc16f2e2c7ae8adf64e5e62ae3dcb631717c6')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/core/heirloom-mailx/PKGBUILD b/core/heirloom-mailx/PKGBUILD
index 028d593a3..d5681bc24 100644
--- a/core/heirloom-mailx/PKGBUILD
+++ b/core/heirloom-mailx/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 113975 2011-03-11 00:21:09Z stephane $
+# $Id: PKGBUILD 132725 2011-07-25 13:08:32Z stephane $
# Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
# Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
# Contributor: Andreas Wagner <Andreas dot Wagner at em dot uni-frankfurt dot de>
pkgname=heirloom-mailx
pkgver=12.5
-pkgrel=1
+pkgrel=2
pkgdesc="A commandline utility for sending and receiving email"
arch=('i686' 'x86_64')
url="http://heirloom.sourceforge.net/mailx.html"
license=('custom')
groups=('base')
-depends=('openssl')
+depends=('openssl' 'krb5')
optdepends=('smtp-forwarder: for sending mail')
replaces=('mailx' 'mailx-heirloom')
provides=('mailx' 'mailx-heirloom')
@@ -29,8 +29,8 @@ mksource() {
_dirname=${pkgname}-${pkgver}
mv $D ${_dirname}
- tar -cJv --exclude=CVS -f ${_dirname}.tar.xz ${dirname}
- rm -r ${_dirname}
+ tar -cJv --exclude=CVS -f ${_dirname}.tar.xz ${_dirname}
+ rm -rf ${_dirname}
}
build() {
diff --git a/core/iptables/PKGBUILD b/core/iptables/PKGBUILD
index b4d6939b4..799f19ad6 100644
--- a/core/iptables/PKGBUILD
+++ b/core/iptables/PKGBUILD
@@ -1,53 +1,67 @@
-# $Id: PKGBUILD 131995 2011-07-18 20:27:00Z ronald $
+# $Id: PKGBUILD 133073 2011-07-27 15:33:16Z dan $
# Maintainer: Ronald van Haren <ronald.archlinux.org>
# Contributor: Thomas Baechler <thomas@archlinux.org>
pkgname=iptables
-pkgver=1.4.11.1
-pkgrel=1
+pkgver=1.4.12
+pkgrel=2
pkgdesc="A Linux kernel packet control tool"
arch=('i686' 'x86_64')
license=('GPL2')
-url="http://www.netfilter.org/"
+url="http://www.netfilter.org/projects/iptables/index.html"
depends=('glibc' 'bash')
+makedepends=('linux-api-headers')
options=('!libtool')
source=(http://www.iptables.org/projects/iptables/files/${pkgname}-${pkgver}.tar.bz2
iptables
ip6tables
empty.rules
simple_firewall.rules
- iptables.conf.d)
+ iptables.conf.d
+ empty-filter.rules
+ empty-mangle.rules
+ empty-nat.rules
+ empty-raw.rules
+ empty-security.rules)
backup=(etc/conf.d/iptables)
-sha1sums=('2aa0d215485133f2817973b0914a132f628d9f3a'
- 'd7540316581bb66c5594885882a14ba394e95098'
- '70d70113e3a23f0fe99404c5536507a887a4ca5c'
+sha1sums=('6c3f6eceadf5dab570d757d74a7194ef75be3ee3'
+ '5bb6fa526665cdd728c26f0f282f5a51f220cf88'
+ '2db68906b603e5268736f48c8e251f3a49da1d75'
'83b3363878e3660ce23b2ad325b53cbd6c796ecf'
'9907f9e815592837abc7fa3264a401567b7606ab'
- '1c52444ffbecc09f56bb325db49e924dd32f9213')
+ 'cdb830137192bbe002c6d01058656bd053ed0ddd'
+ 'd9f9f06b46b4187648e860afa0552335aafe3ce4'
+ 'c45b738b5ec4cfb11611b984c21a83b91a2d58f3'
+ '1694d79b3e6e9d9d543f6a6e75fed06066c9a6c6'
+ '7db53bb882f62f6c677cc8559cff83d8bae2ef73'
+ 'ebbd1424a1564fd45f455a81c61ce348f0a14c2e')
build() {
- cd ${srcdir}/${pkgname}-${pkgver}
+ cd "${srcdir}/${pkgname}-${pkgver}"
# http://bugs.archlinux.org/task/17046
sed -i '87 i libxt_RATEEST.so: libxt_RATEEST.oo' extensions/GNUmakefile.in
sed -i '88 i \\t${AM_VERBOSE_CCLD} ${CCLD} ${AM_LDFLAGS} -lm -shared ${LDFLAGS} -o $@ $<;\n' extensions/GNUmakefile.in
- ./configure --prefix=/usr --with-kernel=usr/src/linux-$(uname -r) \
- --libexecdir=/usr/lib/iptables --sysconfdir=/etc \
- --with-xtlibdir=/usr/lib/iptables \
- --enable-devel --enable-libipq
+ ./configure --prefix=/usr \
+ --libexecdir=/usr/lib/iptables --sysconfdir=/etc \
+ --with-xtlibdir=/usr/lib/iptables \
+ --enable-devel --enable-libipq
make
}
package() {
- cd ${srcdir}/${pkgname}-${pkgver}
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ make DESTDIR="${pkgdir}" install
- make DESTDIR=${pkgdir} install
+ cd "${srcdir}"
+ install -D -m755 iptables "${pkgdir}"/etc/rc.d/iptables
+ install -D -m755 ip6tables "${pkgdir}"/etc/rc.d/ip6tables
+ install -D -m644 empty.rules "${pkgdir}"/etc/iptables/empty.rules
+ install -D -m644 simple_firewall.rules "${pkgdir}"/etc/iptables/simple_firewall.rules
+ install -D -m644 iptables.conf.d "${pkgdir}"/etc/conf.d/iptables
- install -D -m755 ../iptables ${pkgdir}/etc/rc.d/iptables
- install -D -m755 ../ip6tables ${pkgdir}/etc/rc.d/ip6tables
- install -D -m644 ../empty.rules ${pkgdir}/etc/iptables/empty.rules
- install -D -m644 ../simple_firewall.rules ${pkgdir}/etc/iptables/simple_firewall.rules
- install -D -m644 ../iptables.conf.d ${pkgdir}/etc/conf.d/iptables
+ mkdir -p "${pkgdir}/var/lib/iptables"
+ install -m644 empty-{filter,mangle,nat,raw,security}.rules ${pkgdir}/var/lib/iptables/
}
diff --git a/core/iptables/empty-filter.rules b/core/iptables/empty-filter.rules
new file mode 100644
index 000000000..5a4de4876
--- /dev/null
+++ b/core/iptables/empty-filter.rules
@@ -0,0 +1,6 @@
+# Empty iptables filter table rule file
+*filter
+:INPUT ACCEPT [0:0]
+:FORWARD ACCEPT [0:0]
+:OUTPUT ACCEPT [0:0]
+COMMIT
diff --git a/core/iptables/empty-mangle.rules b/core/iptables/empty-mangle.rules
new file mode 100644
index 000000000..49d493c4d
--- /dev/null
+++ b/core/iptables/empty-mangle.rules
@@ -0,0 +1,8 @@
+# Empty iptables mangle table rules file
+*mangle
+:PREROUTING ACCEPT [0:0]
+:INPUT ACCEPT [0:0]
+:FORWARD ACCEPT [0:0]
+:OUTPUT ACCEPT [0:0]
+:POSTROUTING ACCEPT [0:0]
+COMMIT
diff --git a/core/iptables/empty-nat.rules b/core/iptables/empty-nat.rules
new file mode 100644
index 000000000..437e96411
--- /dev/null
+++ b/core/iptables/empty-nat.rules
@@ -0,0 +1,7 @@
+# Empty iptables nat table rules file
+*nat
+:PREROUTING ACCEPT [0:0]
+:INPUT ACCEPT [0:0]
+:OUTPUT ACCEPT [0:0]
+:POSTROUTING ACCEPT [0:0]
+COMMIT
diff --git a/core/iptables/empty-raw.rules b/core/iptables/empty-raw.rules
new file mode 100644
index 000000000..8dc50d23e
--- /dev/null
+++ b/core/iptables/empty-raw.rules
@@ -0,0 +1,5 @@
+# Empty iptables raw table rules file
+*raw
+:PREROUTING ACCEPT [0:0]
+:OUTPUT ACCEPT [0:0]
+COMMIT
diff --git a/core/iptables/empty-security.rules b/core/iptables/empty-security.rules
new file mode 100644
index 000000000..4531fa13f
--- /dev/null
+++ b/core/iptables/empty-security.rules
@@ -0,0 +1,6 @@
+# Empty iptables security table rules file
+*security
+:INPUT ACCEPT [0:0]
+:FORWARD ACCEPT [0:0]
+:OUTPUT ACCEPT [0:0]
+COMMIT
diff --git a/core/iptables/ip6tables b/core/iptables/ip6tables
index 1733db281..2d119e3ed 100755
--- a/core/iptables/ip6tables
+++ b/core/iptables/ip6tables
@@ -4,7 +4,6 @@
[ -f /etc/conf.d/iptables ] && . /etc/conf.d/iptables
# Set defaults if settings are missing
-[ -z "$IP6TABLES" ] && IP6TABLES=/usr/sbin/ip6tables
[ -z "$IP6TABLES_CONF" ] && IP6TABLES_CONF=/etc/iptables/ip6tables.rules
. /etc/rc.conf
@@ -12,14 +11,14 @@
case "$1" in
start)
- if [ ! -f $IP6TABLES_CONF ]; then
- echo "Cannot load iptables rules: $IP6TABLES_CONF is missing!" >&2
+ if [ ! -f "$IP6TABLES_CONF" ]; then
+ echo "Cannot load ip6tables rules: $IP6TABLES_CONF is missing!" >&2
exit 1
fi
stat_busy "Starting IP6 Tables"
if [ "$IPTABLES_FORWARD" = "1" ]; then
- echo 1 >/proc/sys/net/ipv6/conf/default/forwarding
- echo 1 >/proc/sys/net/ipv6/conf/all/forwarding
+ echo 1 >/proc/sys/net/ipv6/conf/default/forwarding
+ echo 1 >/proc/sys/net/ipv6/conf/all/forwarding
fi
if ck_daemon ip6tables; then
/usr/sbin/ip6tables-restore < $IP6TABLES_CONF
@@ -35,42 +34,16 @@ case "$1" in
;;
stop)
stat_busy "Stopping IP6 Tables"
- echo 0 >/proc/sys/net/ipv6/conf/all/forwarding
- echo 0 >/proc/sys/net/ipv6/conf/default/forwarding
if ! ck_daemon ip6tables; then
fail=0
for table in $(cat /proc/net/ip6_tables_names); do
- $IP6TABLES -t $table -F &>/dev/null && \
- $IP6TABLES -t $table -X &>/dev/null && \
- $IP6TABLES -t $table -Z &>/dev/null
+ ip6tables-restore < /var/lib/iptables/empty-$table.rules
[ $? -gt 0 ] && fail=1
done
if [ $fail -gt 0 ]; then
stat_fail
else
rm_daemon ip6tables
- # reset policies
- for table in filter mangle raw; do
- if grep -qw $table /proc/net/ip6_tables_names; then
- $IP6TABLES -t $table -P OUTPUT ACCEPT
- fi
- done
- for table in filter mangle; do
- if grep -qw $table /proc/net/ip6_tables_names; then
- $IP6TABLES -t $table -P INPUT ACCEPT
- $IP6TABLES -t $table -P FORWARD ACCEPT
- fi
- done
- for table in mangle raw; do
- if grep -qw $table /proc/net/ip6_tables_names; then
- $IP6TABLES -t $table -P PREROUTING ACCEPT
- fi
- done
- for table in mangle; do
- if grep -qw $table /proc/net/ip6_tables_names; then
- $IP6TABLES -t $table -P POSTROUTING ACCEPT
- fi
- done
stat_done
fi
else
@@ -79,7 +52,6 @@ case "$1" in
;;
restart)
$0 stop
- sleep 2
$0 start
;;
save)
diff --git a/core/iptables/iptables b/core/iptables/iptables
index 50c13d5c1..fbb02face 100755
--- a/core/iptables/iptables
+++ b/core/iptables/iptables
@@ -4,7 +4,6 @@
[ -f /etc/conf.d/iptables ] && . /etc/conf.d/iptables
# Set defaults if settings are missing
-[ -z "$IPTABLES" ] && IPTABLES=/usr/sbin/iptables
[ -z "$IPTABLES_CONF" ] && IPTABLES_CONF=/etc/iptables/iptables.rules
. /etc/rc.conf
@@ -12,7 +11,7 @@
case "$1" in
start)
- if [ ! -f $IPTABLES_CONF ]; then
+ if [ ! -f "$IPTABLES_CONF" ]; then
echo "Cannot load iptables rules: $IPTABLES_CONF is missing!" >&2
exit 1
fi
@@ -34,41 +33,16 @@ case "$1" in
;;
stop)
stat_busy "Stopping IP Tables"
- echo 0 >/proc/sys/net/ipv4/ip_forward
if ! ck_daemon iptables; then
fail=0
for table in $(cat /proc/net/ip_tables_names); do
- $IPTABLES -t $table -F &>/dev/null && \
- $IPTABLES -t $table -X &>/dev/null && \
- $IPTABLES -t $table -Z &>/dev/null
+ iptables-restore < /var/lib/iptables/empty-$table.rules
[ $? -gt 0 ] && fail=1
done
if [ $fail -gt 0 ]; then
stat_fail
else
rm_daemon iptables
- # reset policies
- for table in filter nat mangle raw; do
- if grep -qw $table /proc/net/ip_tables_names; then
- $IPTABLES -t $table -P OUTPUT ACCEPT
- fi
- done
- for table in filter mangle; do
- if grep -qw $table /proc/net/ip_tables_names; then
- $IPTABLES -t $table -P INPUT ACCEPT
- $IPTABLES -t $table -P FORWARD ACCEPT
- fi
- done
- for table in nat mangle raw; do
- if grep -qw $table /proc/net/ip_tables_names; then
- $IPTABLES -t $table -P PREROUTING ACCEPT
- fi
- done
- for table in nat mangle; do
- if grep -qw $table /proc/net/ip_tables_names; then
- $IPTABLES -t $table -P POSTROUTING ACCEPT
- fi
- done
stat_done
fi
else
@@ -77,7 +51,6 @@ case "$1" in
;;
restart)
$0 stop
- sleep 2
$0 start
;;
save)
diff --git a/core/iptables/iptables.conf.d b/core/iptables/iptables.conf.d
index 07bc11aa1..1c6cc7b5d 100644
--- a/core/iptables/iptables.conf.d
+++ b/core/iptables/iptables.conf.d
@@ -1,8 +1,12 @@
# Configuration for iptables rules
-
-IPTABLES=/usr/sbin/iptables
-IP6TABLES=/usr/sbin/ip6tables
-
IPTABLES_CONF=/etc/iptables/iptables.rules
IP6TABLES_CONF=/etc/iptables/ip6tables.rules
-IPTABLES_FORWARD=0 # enable IP forwarding?
+
+# Enable IP forwarding (both IPv4 and IPv6)
+# NOTE: this is not the recommended way to do this, and is supported only for
+# backward compatibility. Instead, use /etc/sysctl.conf and set the following
+# options:
+# * net.ipv4.ip_forward=1
+# * net.ipv6.conf.default.forwarding=1
+# * net.ipv6.conf.all.forwarding=1
+#IPTABLES_FORWARD=0
diff --git a/core/krb5/PKGBUILD b/core/krb5/PKGBUILD
index 6dc3dcc01..94356ab28 100644
--- a/core/krb5/PKGBUILD
+++ b/core/krb5/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 129991 2011-06-30 18:09:30Z stephane $
+# $Id: PKGBUILD 133509 2011-07-28 19:16:56Z stephane $
# Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
pkgname=krb5
pkgver=1.9.1
-pkgrel=2
+pkgrel=3
pkgdesc="The Kerberos network authentication system"
arch=('i686' 'x86_64')
url="http://web.mit.edu/kerberos/"
@@ -16,16 +16,28 @@ conflicts=('heimdal')
backup=('etc/krb5.conf' 'var/lib/krb5kdc/kdc.conf')
source=(http://web.mit.edu/kerberos/dist/${pkgname}/1.9/${pkgname}-${pkgver}-signed.tar
krb5-kadmind
- krb5-kdc)
+ krb5-kdc
+ krb5-1.9.1-config-script.patch)
sha1sums=('e23a1795a237521493da9cf3443ac8b98a90c066'
'2aa229369079ed1bbb201a1ef72c47bf143f4dbe'
- '77d2312ecd8bf12a6e72cc8fd871a8ac93b23393')
+ '77d2312ecd8bf12a6e72cc8fd871a8ac93b23393'
+ '8d1ec8bdb39fec230caace112d1a41ad792f7d97')
options=('!emptydirs')
build() {
tar zxvf ${pkgname}-${pkgver}.tar.gz
cd "${srcdir}/${pkgname}-${pkgver}/src"
+ # - Make krb5-config suppress CFLAGS output when called with --libs
+ # cf https://bugzilla.redhat.com/show_bug.cgi?id=544391
+ # http://pkgs.fedoraproject.org/gitweb/?p=krb5.git;a=blob;f=krb5-1.7-buildconf.patch
+ #
+ # - Omit extra libraries because their interfaces are not exposed to applications
+ # by libkrb5, unless do_deps is set to 1, which indicates that the caller
+ # wants the whole list.
+ # cf http://pkgs.fedoraproject.org/gitweb/?p=krb5.git;a=blob;f=krb5-1.7-nodeplibs.patch
+ patch -Np2 -i ${srcdir}/krb5-1.9.1-config-script.patch
+
export CFLAGS+=" -fPIC -fno-strict-aliasing -fstack-protector-all"
export CPPFLAGS+=" -I/usr/include/et"
./configure --prefix=/usr \
diff --git a/core/krb5/krb5-1.9.1-config-script.patch b/core/krb5/krb5-1.9.1-config-script.patch
new file mode 100644
index 000000000..96ee6b001
--- /dev/null
+++ b/core/krb5/krb5-1.9.1-config-script.patch
@@ -0,0 +1,25 @@
+diff -Naur krb5-1.9.1.ori/src/krb5-config.in krb5-1.9.1/src/krb5-config.in
+--- krb5-1.9.1.ori/src/krb5-config.in 2010-01-19 13:44:57.000000000 -0500
++++ krb5-1.9.1/src/krb5-config.in 2011-07-28 14:32:00.546990621 -0400
+@@ -186,7 +186,7 @@
+ -e 's#\$(RPATH_FLAG)#'"$RPATH_FLAG"'#' \
+ -e 's#\$(LDFLAGS)#'"$LDFLAGS"'#' \
+ -e 's#\$(PTHREAD_CFLAGS)#'"$PTHREAD_CFLAGS"'#' \
+- -e 's#\$(CFLAGS)#'"$CFLAGS"'#'`
++ -e 's#\$(CFLAGS)##'`
+
+ if test $library = 'kdb'; then
+ lib_flags="$lib_flags -lkdb5 $KDB5_DB_LIB"
+@@ -214,7 +214,11 @@
+ fi
+
+ if test $library = 'krb5'; then
+- lib_flags="$lib_flags -lkrb5 -lk5crypto -lcom_err $GEN_LIB $LIBS $DL_LIB"
++ if test 0$do_deps -eq 1 ; then
++ lib_flags="$lib_flags -lkrb5 -lk5crypto -lcom_err $GEN_LIB $LIBS $DL_LIB"
++ else
++ lib_flags="$lib_flags -lkrb5 -lk5crypto -lcom_err"
++ fi
+ fi
+
+ echo $lib_flags
diff --git a/core/libedit/PKGBUILD b/core/libedit/PKGBUILD
index fb9152883..1d7c56fb8 100644
--- a/core/libedit/PKGBUILD
+++ b/core/libedit/PKGBUILD
@@ -1,29 +1,30 @@
-# $Id: PKGBUILD 112952 2011-03-07 23:45:40Z bisson $
+# $Id: PKGBUILD 132376 2011-07-23 23:23:53Z bisson $
+# Maintainer: Gaetan Bisson <bisson@archlinux.org>
# Maintainer: Vesa Kaihlavirta <vesa@archlinux.org>
# Contributor: Roman Cheplyaka <roma@ro-che.info>
pkgname=libedit
-pkgver=20110227_3.0
+pkgver=20110709_3.0
pkgrel=1
pkgdesc='Command line editor library providing generic line editing, history, and tokenization functions'
arch=('i686' 'x86_64')
url='http://www.thrysoee.dk/editline/'
license=('BSD')
depends=('ncurses')
-source=("http://www.thrysoee.dk/editline/libedit-${pkgver/_/-}.tar.gz")
-sha1sums=('afe84b9e16fc903d5a3eceda90013d7ad03db794')
options=('!libtool')
+source=("http://www.thrysoee.dk/editline/libedit-${pkgver/_/-}.tar.gz")
+sha1sums=('63a62e0c52a0a2b3c933f400039e24724498cfb4')
build() {
- cd "${srcdir}/$pkgname-${pkgver/_/-}"
+ cd "${srcdir}/${pkgname}-${pkgver/_/-}"
./configure --prefix=/usr --enable-widec --enable-static=no
make
}
package() {
- cd "${srcdir}/$pkgname-${pkgver/_/-}"
- make prefix="$pkgdir"/usr install
+ cd "${srcdir}/${pkgname}-${pkgver/_/-}"
+ make prefix="${pkgdir}"/usr install
- cp "$pkgdir"/usr/share/man/man3/editline.3 "$pkgdir"/usr/share/man/man3/el.3
- install -D -m0644 COPYING "$pkgdir"/usr/share/licenses/libedit/LICENSE
+ cp "${pkgdir}"/usr/share/man/man3/editline.3 "${pkgdir}"/usr/share/man/man3/el.3
+ install -D -m0644 COPYING "${pkgdir}"/usr/share/licenses/libedit/LICENSE
}
diff --git a/core/openldap/PKGBUILD b/core/openldap/PKGBUILD
index 636e9a3ac..24d8d5ffe 100644
--- a/core/openldap/PKGBUILD
+++ b/core/openldap/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 132145 2011-07-21 04:31:17Z eric $
+# $Id: PKGBUILD 132558 2011-07-24 23:50:57Z eric $
# Maintainer:
pkgbase=openldap
pkgname=('libldap' 'openldap')
pkgver=2.4.26
-pkgrel=2
+pkgrel=3
arch=('i686' 'x86_64')
url="http://www.openldap.org/"
license=('custom')
@@ -12,7 +12,7 @@ makedepends=('groff' 'libfetch' 'e2fsprogs' 'libtool' 'util-linux' 'libsasl')
source=(ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/${pkgbase}-${pkgver}.tgz
slapd slapd.default ntlm.patch)
md5sums=('f36f3086031dd56ae94f722ffae8df5e'
- '7ea596cc1d6cbcfe1deea29ec66ab317'
+ '40fdbdd6c343019cbadf4eb26c6189f2'
'6be69f6b7e522cb64cce8703da81ed32'
'4258ddbef923d1f29f2843bc050f8c56')
@@ -78,24 +78,18 @@ package_openldap() {
popd
done
rm "${pkgdir}"/usr/share/man/man5/ldap.conf.5
+ rm -r "${pkgdir}"/run
# get rid of duplicate default conf files
rm "${pkgdir}"/etc/openldap/*.default
ln -s ../lib/slapd "${pkgdir}"/usr/sbin/slapd
- install -dm700 "${pkgdir}"/var/lib/openldap
- chown -R 439:439 "${pkgdir}"/var/lib/openldap
-
- install -dm755 "${pkgdir}"/run/openldap
- chown 439:439 "${pkgdir}"/run/openldap
-
chown root:439 "${pkgdir}"/etc/openldap/{slapd.conf,DB_CONFIG.example}
chmod 640 "${pkgdir}"/etc/openldap/{slapd.conf,DB_CONFIG.example}
- install -dm700 "${pkgdir}"/etc/openldap/slapd.d
- chown 439:439 "${pkgdir}"/etc/openldap/slapd.d
-
+ install -dm700 -o 439 -g 439 "${pkgdir}"/var/lib/openldap
+ install -dm700 -o 439 -g 439 "${pkgdir}"/etc/openldap/slapd.d
install -Dm755 "${srcdir}"/slapd "${pkgdir}"/etc/rc.d/slapd
install -Dm644 "${srcdir}"/slapd.default "${pkgdir}"/etc/conf.d/slapd
install -Dm644 LICENSE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
diff --git a/core/openldap/slapd b/core/openldap/slapd
index 5156b4d61..4f212da66 100755
--- a/core/openldap/slapd
+++ b/core/openldap/slapd
@@ -9,6 +9,7 @@ PID=`pidof -o %PPID /usr/sbin/slapd`
case "$1" in
start)
stat_busy "Starting OpenLDAP"
+ [ ! -d /run/openldap ] && install -d -m755 -o ldap -g ldap /run/openldap
if [ -z "$PID" ]; then
if [ -z "$SLAPD_SERVICES" ]; then
/usr/sbin/slapd -u ldap -g ldap $SLAPD_OPTIONS
diff --git a/core/procps/PKGBUILD b/core/procps/PKGBUILD
index 225e4db6f..b04ebf52c 100644
--- a/core/procps/PKGBUILD
+++ b/core/procps/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 102904 2010-12-12 23:53:18Z eric $
+# $Id: PKGBUILD 132740 2011-07-25 18:18:22Z foutrelis $
# Maintainer: Eric Belanger <eric@archlinux.org>
pkgname=procps
pkgver=3.2.8
-pkgrel=3
+pkgrel=4
pkgdesc="Utilities for monitoring your system and processes on your system"
arch=('i686' 'x86_64')
url="http://procps.sourceforge.net/"
@@ -11,36 +11,47 @@ license=('GPL' 'LGPL')
groups=('base')
depends=('ncurses')
backup=('etc/sysctl.conf')
-source=(http://procps.sourceforge.net/procps-${pkgver}.tar.gz sysctl.conf\
- groff-top-manpage.patch procps-3.2.7-free-hlmem.patch\
- procps-3.2.7-longcmd.patch procps-3.2.7-ps-man-fmt.patch\
- procps-3.2.7-psman.patch procps-3.2.7-slabtop-once.patch\
- procps-3.2.7-top-clrscr.patch procps-3.2.7-top-cpu0.patch\
- procps-3.2.7-top-env-cpuloop.patch procps-3.2.7-top-manpage.patch\
- procps-3.2.7-top-remcpu.patch procps-3.2.7-top-sorthigh.patch\
- procps-3.2.7-watch-unicode.patch procps-3.2.7-w-best.patch\
- procps-3.2.8+gmake-3.82.patch procps-3.2.8-setlocale.patch\
- procps-3.2.8-threads.patch procps-3.2.8-linux-ver-init.patch)
-md5sums=('9532714b6846013ca9898984ba4cd7e0' '9be3a131a7068aae11418e6dd99e2221'\
- '111f33c3fd8fab2fed36c279065fefff' '81ac7fb50fcdb03e57055c7b763bb275'\
- 'cb020bfd46689908b56bf3fc5a55828a' '8d74603be1e426037a1e2c2743ef7345'\
- 'bfb7530e248b86f1abf32bca09f28b68' '9a8c81aee89531b4a72f4e4e44fb055d'\
- '511023a3f39a90aa6efcf77120d32eb6' 'f29ef0b3a74767469651c9c335f09403'\
- 'd49673c19fa1a70f8e03fc1c24233458' '669955ca7fa7688e1c3ae7e723e0a567'\
- 'f77626450619b4bebbd67b9e164f1857' 'c71b853144b4d22b861e435362845091'\
- '105fbbf179e63b7ca960a2dd2e5fab5b' '7f2540d2d4a2a1a6af70e9a980835753'\
- '8d1025ae906bf0320ad9bb5095f1b970' '2e6cce598f11d75becebbe58dbe9cbd4'\
- 'e2e5393d49034435c68469d008d56489' '6f46c8ea37c447a2d478883e89bf4d25')
-sha1sums=('a0c86790569dec26b5d9037e8868ca907acc9829' '9b9a314010d042b5aa487893c06f361531525e6a'\
- 'bdd627f602ed2e38994d49309de0edbd90b41aff' 'da1b9e61f8df4a8e23a7032b245dd99e32e2c01c'\
- '1a656d8094be41e019b2a9598b07c8a3d47f9de3' 'ba9ad9f0bde3e84484b5a0238e53534438e924be'\
- '9944224ed2f5bd7d7fb505127bd71d6f01d88373' '954026785a9e6c90d796e93563fcea2a693691e8'\
- '8582cd15346fa939f3fd01081620de0ffc617335' '80e31310da53baf095e905d94485324932e433df'\
- '15fe886a2b4bed5885e6d457954e1145d1dcd2a2' '16737700b22eec8f4e8d16bce099f4b1662501e2'\
- 'bce21809ee0cb917ddf5b0c0bf2a91ea50feb0c6' '1be00d71e8e16ff2d656e5dd1f9988f2f3c0d5a0'\
- '52068a433535ec3d5d974141be3d6d3b6a41725a' '3a8f1ba912112d7520becb28746e97b11d9b0c86'\
- '3a4908ed8dbc936e39cb9094af8098ef9e656581' '09b1f6a3f9691b9f1432549a7a74a90ee5cfbdde'\
- '926b92913201f21c45d48436c0902cffc059ce27' '171d5352940200c209e0c2d43c17f01c02173a66')
+source=(http://procps.sourceforge.net/procps-${pkgver}.tar.gz sysctl.conf
+ groff-top-manpage.patch
+ procps-3.2.7-top-manpage.patch
+ procps-3.2.7-free-hlmem.patch
+ procps-3.2.7-ps-man-fmt.patch
+ procps-3.2.7-longcmd.patch
+ procps-3.2.7-psman.patch
+ procps-3.2.7-slabtop-once.patch
+ procps-3.2.7-top-clrscr.patch
+ procps-3.2.7-top-cpu0.patch
+ procps-3.2.7-top-env-cpuloop.patch
+ procps-3.2.7-top-remcpu.patch
+ procps-3.2.7-top-sorthigh.patch
+ procps-3.2.7-watch-unicode.patch
+ procps-3.2.7-w-best.patch
+ procps-3.2.8-gmake-3.82.patch
+ procps-3.2.8-setlocale.patch
+ procps-3.2.8-threads.patch
+ procps-3.2.8-linux-ver-init.patch
+ procps-3.2.8-kernel3-uts.patch)
+sha1sums=('a0c86790569dec26b5d9037e8868ca907acc9829'
+ '9b9a314010d042b5aa487893c06f361531525e6a'
+ 'bdd627f602ed2e38994d49309de0edbd90b41aff'
+ '16737700b22eec8f4e8d16bce099f4b1662501e2'
+ 'da1b9e61f8df4a8e23a7032b245dd99e32e2c01c'
+ 'ba9ad9f0bde3e84484b5a0238e53534438e924be'
+ '1a656d8094be41e019b2a9598b07c8a3d47f9de3'
+ '9944224ed2f5bd7d7fb505127bd71d6f01d88373'
+ '954026785a9e6c90d796e93563fcea2a693691e8'
+ '8582cd15346fa939f3fd01081620de0ffc617335'
+ '80e31310da53baf095e905d94485324932e433df'
+ '15fe886a2b4bed5885e6d457954e1145d1dcd2a2'
+ 'bce21809ee0cb917ddf5b0c0bf2a91ea50feb0c6'
+ '1be00d71e8e16ff2d656e5dd1f9988f2f3c0d5a0'
+ '52068a433535ec3d5d974141be3d6d3b6a41725a'
+ '3a8f1ba912112d7520becb28746e97b11d9b0c86'
+ '3a4908ed8dbc936e39cb9094af8098ef9e656581'
+ '09b1f6a3f9691b9f1432549a7a74a90ee5cfbdde'
+ '926b92913201f21c45d48436c0902cffc059ce27'
+ '171d5352940200c209e0c2d43c17f01c02173a66'
+ 'e2b2917e5462bd0aa3cb1b62942dbe8e8e81c16b')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
@@ -58,12 +69,13 @@ build() {
patch -p1 < ../procps-3.2.7-top-sorthigh.patch
patch -p1 < ../procps-3.2.7-watch-unicode.patch
patch -p1 < ../procps-3.2.7-w-best.patch
- patch -p1 < ../procps-3.2.8+gmake-3.82.patch
+ patch -p1 < ../procps-3.2.8-gmake-3.82.patch
patch -p1 < ../procps-3.2.8-setlocale.patch
patch -p1 < ../procps-3.2.8-threads.patch
patch -p0 < ../procps-3.2.8-linux-ver-init.patch
+ patch -p1 < ../procps-3.2.8-kernel3-uts.patch
sed -i "s:\$(lib64):lib:" Makefile
- make
+ make CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS"
}
package() {
diff --git a/core/procps/procps-3.2.8-gmake-3.82.patch b/core/procps/procps-3.2.8-gmake-3.82.patch
new file mode 100644
index 000000000..87ab13ea4
--- /dev/null
+++ b/core/procps/procps-3.2.8-gmake-3.82.patch
@@ -0,0 +1,14 @@
+Index: procps-3.2.8/Makefile
+===================================================================
+--- procps-3.2.8.orig/Makefile
++++ procps-3.2.8/Makefile
+@@ -174,7 +174,8 @@ INSTALL := $(BINFILES) $(MANFILES)
+ # want this rule first, use := on ALL, and ALL not filled in yet
+ all: do_all
+
+--include */module.mk
++-include proc/module.mk
++-include ps/module.mk
+
+ do_all: $(ALL)
+
diff --git a/core/procps/procps-3.2.8-kernel3-uts.patch b/core/procps/procps-3.2.8-kernel3-uts.patch
new file mode 100644
index 000000000..a72ae59e3
--- /dev/null
+++ b/core/procps/procps-3.2.8-kernel3-uts.patch
@@ -0,0 +1,20 @@
+diff -Naur procps-3.2.8-20110302git.orig/proc/version.c procps-3.2.8-20110302git/proc/version.c
+--- procps-3.2.8-20110302git.orig/proc/version.c 2011-06-10 17:00:33.000000000 +0200
++++ procps-3.2.8-20110302git/proc/version.c 2011-06-10 17:20:17.000000000 +0200
+@@ -38,10 +38,15 @@
+ void init_Linux_version(void) {
+ static struct utsname uts;
+ int x = 0, y = 0, z = 0; /* cleared in case sscanf() < 3 */
++ int version_string_depth;
+
+ if (uname(&uts) == -1) /* failure implies impending death */
+ exit(1);
+- if (sscanf(uts.release, "%d.%d.%d", &x, &y, &z) < 3)
++
++ version_string_depth = sscanf(uts.release, "%d.%d.%d", &x, &y, &z);
++
++ if ((version_string_depth < 2) || /* Non-standard for all known kernels */
++ ((version_string_depth < 3) && (x < 3))) /* Non-standard for 2.x.x kernels */
+ fprintf(stderr, /* *very* unlikely to happen by accident */
+ "Non-standard uts for running kernel:\n"
+ "release %s=%d.%d.%d gives version code %d\n",
generated by cgit v1.2.3-54-g00ecf (git 2.45.2) at 2024-07-04 13:50:49 +0000