summaryrefslogtreecommitdiff
path: root/core
diff options
context:
space:
mode:
Diffstat (limited to 'core')
-rw-r--r--core/bash/PKGBUILD12
-rw-r--r--core/binutils/PKGBUILD38
-rw-r--r--core/cronie/PKGBUILD9
-rw-r--r--core/cronie/service1
-rw-r--r--core/dhcpcd/PKGBUILD8
-rw-r--r--core/gawk/PKGBUILD15
-rw-r--r--core/gettext/PKGBUILD27
-rw-r--r--core/iptables/PKGBUILD16
-rw-r--r--core/iptables/ip6tables.service1
-rw-r--r--core/iptables/iptables.service1
-rw-r--r--core/iptables/simple_firewall.rules2
-rw-r--r--core/krb5/PKGBUILD9
-rw-r--r--core/krb5/krb5-config_LDFLAGS.patch12
-rw-r--r--core/mpfr/PKGBUILD5
-rw-r--r--core/patch/PKGBUILD17
-rw-r--r--core/patch/patch-2.7.1-initialize-data-structures-early-enough.patch81
16 files changed, 173 insertions, 81 deletions
diff --git a/core/bash/PKGBUILD b/core/bash/PKGBUILD
index 34389323e..b8946099e 100644
--- a/core/bash/PKGBUILD
+++ b/core/bash/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 170164 2012-11-04 00:51:49Z allan $
+# $Id: PKGBUILD 174629 2013-01-05 10:20:51Z allan $
# Maintainer: Allan McRae <allan@archlinux.org>
# Contributor: Aaron Griffin <aaron@archlinux.org>
pkgname=bash
_basever=4.2
-_patchlevel=039 #prepare for some patches
+_patchlevel=042 #prepare for some patches
pkgver=$_basever.$_patchlevel
pkgrel=1
pkgdesc="The GNU Bourne Again shell"
@@ -157,4 +157,10 @@ md5sums=('3fb927c7c33022f1c327f14a81c0d4b0'
'9ef3c308cde413e95866c1266cfb4e98'
'afbb94e04dab29bd4ce92199892f2b5e'
'cd48f57a404498d4e5c73a3501c4b1a5'
- 'd2693a2728b5a0448947d23ce47cb4b3')
+ 'd2693a2728b5a0448947d23ce47cb4b3'
+ '00a2371b6c05acbfce6bc850c6d982f8'
+ '72744ac844a1dfd15dddbba7f73ec45c'
+ '7bc4942a66ca4024ee964db7ede07896'
+ '7e97f02d9dd1436eed278f2732542ecf'
+ '1cf7701017ebfc8e129de92c8f8b798c'
+ '4ef8b5af440bf7b939b7955ce68b4dc7')
diff --git a/core/binutils/PKGBUILD b/core/binutils/PKGBUILD
index 352291a94..ec8ce9d04 100644
--- a/core/binutils/PKGBUILD
+++ b/core/binutils/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 173937 2012-12-28 13:10:59Z allan $
+# $Id: PKGBUILD 174628 2013-01-05 10:20:45Z allan $
# Maintainer: Allan McRae <allan@archlinux.org>
# toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc
pkgname=binutils
pkgver=2.23.1
-pkgrel=2
+pkgrel=3
pkgdesc="A set of programs to assemble and manipulate binary and object files"
arch=('i686' 'x86_64' 'mips64el')
url="http://www.gnu.org/software/binutils/"
@@ -27,29 +27,14 @@ build() {
--with-lib-path=/usr/lib:/usr/local/lib \
--with-bugurl=https://bugs.archlinux.org/ \
--enable-ld=default --enable-gold \
- --enable-plugins --enable-threads --enable-shared \
+ --enable-plugins --enable-threads \
+ --with-pic --enable-shared \
--disable-werror --disable-multilib
# check the host environment and makes sure all the necessary tools are available
make configure-host
make tooldir=${pkgdir}/usr
-
- # Rebuild libiberty.a with -fPIC
- cp -a libiberty libiberty-pic
- make -C libiberty-pic clean
- make CFLAGS="$CFLAGS -fPIC" -C libiberty-pic
-
- # Rebuild libbfd.a with -fPIC
- # hidden visability prevent 3rd party shared libraries exporting bfd non-stable API
- cp -a bfd bfd-pic
- make -C bfd-pic clean
- make CFLAGS="$CFLAGS -fPIC -fvisibility=hidden" -C bfd-pic
-
- # Rebuild libopcodes.a with -fPIC
- cp -a opcodes opcodes-pic
- make -C opcodes-pic clean
- make CFLAGS="$CFLAGS -fPIC" -C opcodes-pic
}
check() {
@@ -68,20 +53,13 @@ package() {
install -m644 ${srcdir}/binutils-${pkgver}/include/libiberty.h ${pkgdir}/usr/include
install -m644 ${srcdir}/binutils-${pkgver}/include/demangle.h ${pkgdir}/usr/include
- # install libraries rebuilt with -fPIC
- install -m644 libiberty-pic/libiberty.a ${pkgdir}/usr/lib
- install -m644 bfd-pic/libbfd.a ${pkgdir}/usr/lib
- install -m644 opcodes/libopcodes.a ${pkgdir}/usr/lib
+ # Install PIC libiberty.a
+ install -m644 libiberty/pic/libiberty.a ${pkgdir}/usr/lib
- # Remove Windows/Novell specific man pages
+ # Remove unwanted files
rm ${pkgdir}/usr/share/man/man1/{dlltool,nlmconv,windres,windmc}*
-
- # why are these distributed with binutils?
rm ${pkgdir}/usr/share/info/{configure,standards}.info
- # Remove these symlinks, they are not ABI stable.
- # Programs should compile static to the .a file.
+ # No shared linking to these files outside binutils
rm ${pkgdir}/usr/lib/lib{bfd,opcodes}.so
- echo "INPUT ( /usr/lib/libbfd.a -liberty -lz )" >${pkgdir}/usr/lib/libbfd.so
- echo "INPUT ( /usr/lib/libopcodes.a -lbfd )" >${pkgdir}/usr/lib/libopcodes.so
}
diff --git a/core/cronie/PKGBUILD b/core/cronie/PKGBUILD
index ebac97c6d..795b8882e 100644
--- a/core/cronie/PKGBUILD
+++ b/core/cronie/PKGBUILD
@@ -3,14 +3,15 @@
pkgname='cronie'
pkgver=1.4.9
-pkgrel=1
+pkgrel=2
pkgdesc='Daemon that runs specified programs at scheduled times and related tools'
url='https://fedorahosted.org/cronie/'
license=('custom:BSD')
arch=('i686' 'x86_64' 'mips64el')
depends=('pam' 'bash' 'run-parts')
-optdepends=('pm-utils: defer anacron when on battery power'
- 'smtp-server: sending cron job output via email')
+optdepends=('pm-utils: defer anacron on battery power'
+ 'smtp-server: send job output via email'
+ 'smtp-forwarder: forward job output to email server')
source=("https://fedorahosted.org/releases/c/r/${pkgname}/${pkgname}-${pkgver}.tar.gz"
'cron.deny'
@@ -19,7 +20,7 @@ source=("https://fedorahosted.org/releases/c/r/${pkgname}/${pkgname}-${pkgver}.t
'rc.d')
sha1sums=('40405cb30b62bd60323e4daf5198f26f0e65c4c4'
'0f279b8fb820340267d578dc85511c980715f91e'
- '3038a05476829f72fc4918bee9176b273ce10340'
+ 'fa91ebee59df127ff3983b8d6fb9e1cc5fca53d0'
'5eff7fb31f6bc0a924243ff046704726cf20c221'
'c08c040ed5cb12bc4fd15639a5242d31ec247ef5')
diff --git a/core/cronie/service b/core/cronie/service
index 5ae193bfc..4fa4d4593 100644
--- a/core/cronie/service
+++ b/core/cronie/service
@@ -4,6 +4,7 @@ Description=Periodic Command Scheduler
[Service]
ExecStart=/usr/sbin/crond -n
ExecReload=/bin/kill -HUP $MAINPID
+KillMode=process
Restart=always
[Install]
diff --git a/core/dhcpcd/PKGBUILD b/core/dhcpcd/PKGBUILD
index c34903a99..3410f3914 100644
--- a/core/dhcpcd/PKGBUILD
+++ b/core/dhcpcd/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 171912 2012-11-23 13:37:09Z ronald $
+# $Id: PKGBUILD 174850 2013-01-07 21:57:19Z ronald $
# Maintainer: Ronald van Haren <ronald.archlinux.org>
# Contributor: Tom Killian <tom.archlinux.org>
# Contributor: Judd Vinet <jvinet.zeroflux.org>
pkgname=dhcpcd
-pkgver=5.6.3
-pkgrel=2
+pkgver=5.6.4
+pkgrel=1
pkgdesc="RFC2131 compliant DHCP client daemon"
url="http://roy.marples.name/projects/dhcpcd/"
arch=('i686' 'x86_64' 'mips64el')
@@ -16,7 +16,7 @@ backup=('etc/conf.d/dhcpcd' 'etc/dhcpcd.conf')
options=('emptydirs') # We Need the Empty /var/lib/dhcpcd Directory
source=("http://roy.marples.name/downloads/$pkgname/$pkgname-$pkgver.tar.bz2" \
'dhcpcd.conf.d' 'dhcpcd_.service' 'dhcpcd.service')
-sha1sums=('d64b589d15821aa5851fda81078183cc61a3e45a'
+sha1sums=('18a09d8fabf926e5d32bd6315b40d77247b11596'
'b67b9ce6a2faaca75fea356966a16be2283b7db0'
'd5304eb00828d4ee2fd879addce473ea09c47635'
'e49e01041f831281a1cd0c97ca21204e0aa07fda')
diff --git a/core/gawk/PKGBUILD b/core/gawk/PKGBUILD
index c64e2a802..7563c2580 100644
--- a/core/gawk/PKGBUILD
+++ b/core/gawk/PKGBUILD
@@ -1,38 +1,35 @@
-# $Id: PKGBUILD 155835 2012-04-07 08:07:16Z allan $
+# $Id: PKGBUILD 174267 2013-01-03 13:58:07Z allan $
# Maintainer:
# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
pkgname=gawk
-pkgver=4.0.1
-pkgrel=1.1
+pkgver=4.0.2
+pkgrel=1
pkgdesc="GNU version of awk"
arch=('i686' 'x86_64' 'mips64el')
url="http://www.gnu.org/directory/GNU/gawk.html"
license=('GPL')
-groups=('base')
+groups=('base' 'base-devel')
depends=('sh' 'glibc')
provides=('awk')
install=gawk.install
source=(ftp://ftp.gnu.org/pub/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz{,.sig})
-md5sums=('bab2bda483e9f32be65b43b8dab39fa5'
- '7cf4e4896509c655dd00ecd4ca9098ef')
+md5sums=('4d505dc2c9f1eb3e9f8d6cac87d4bd1a'
+ '131f79e5aa1528649c90ccf0440db0a6')
build() {
cd ${srcdir}/${pkgname}-${pkgver}
-
./configure --prefix=/usr --libexecdir=/usr/lib
make
}
check() {
cd ${srcdir}/${pkgname}-${pkgver}
-
make check
}
package() {
cd ${srcdir}/${pkgname}-${pkgver}
-
make DESTDIR=${pkgdir} install
install -dm755 ${pkgdir}/bin
diff --git a/core/gettext/PKGBUILD b/core/gettext/PKGBUILD
index b5a5cedfd..cd0d4251c 100644
--- a/core/gettext/PKGBUILD
+++ b/core/gettext/PKGBUILD
@@ -1,35 +1,32 @@
-# $Id: PKGBUILD 142112 2011-11-05 10:14:09Z tpowa $
+# $Id: PKGBUILD 174268 2013-01-03 13:58:09Z allan $
# Maintainer:
pkgname=gettext
-pkgver=0.18.1.1
-pkgrel=4.1
+pkgver=0.18.2
+pkgrel=1
pkgdesc="GNU internationalization library"
arch=('i686' 'x86_64' 'mips64el')
url="http://www.gnu.org/software/gettext/"
license=('GPL')
-groups=('base')
+groups=('base' 'base-devel')
depends=('gcc-libs' 'acl' 'sh' 'glib2')
optdepends=('cvs: for autopoint tool')
options=(!libtool !docs)
install=gettext.install
-source=(ftp://ftp.gnu.org/pub/gnu/gettext/${pkgname}-${pkgver}.tar.gz
- gnulib-no-gets.patch)
-md5sums=('3dd55b952826d2b32f51308f2f91aa89'
- 'ca29994ca712580744feda170999e7ae')
+source=(ftp://ftp.gnu.org/pub/gnu/gettext/${pkgname}-${pkgver}.tar.gz{,.sig})
+md5sums=('0c86e5af70c195ab8bd651d17d783928'
+ '1a658e29a03ab42da6d2d468b0583407')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
- patch -p1 -i "$srcdir/gnulib-no-gets.patch"
- sed -i -e 's/libexpat.so.0/libexpat.so.1/' gettext-tools/src/x-glade.c
- ./configure --build=$CHOST --prefix=/usr --enable-csharp
+ ./configure --prefix=/usr
make
}
-#check() {
-# cd "${srcdir}/${pkgname}-${pkgver}"
-# make check
-#}
+check() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ make check
+}
package() {
cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/core/iptables/PKGBUILD b/core/iptables/PKGBUILD
index 6c4055ba6..f3345c08e 100644
--- a/core/iptables/PKGBUILD
+++ b/core/iptables/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 170004 2012-10-30 23:08:48Z thomas $
+# $Id: PKGBUILD 174851 2013-01-07 21:57:24Z ronald $
# Maintainer: Ronald van Haren <ronald.archlinux.org>
# Contributor: Thomas Baechler <thomas@archlinux.org>
pkgname=iptables
-pkgver=1.4.16.2
+pkgver=1.4.16.3
pkgrel=1
pkgdesc='Linux kernel packet control tool'
arch=('i686' 'x86_64' 'mips64el')
@@ -28,11 +28,11 @@ source=("http://www.iptables.org/projects/iptables/files/${pkgname}-${pkgver}.ta
ip6tables.service
iptables-flush)
backup=(etc/conf.d/iptables)
-sha1sums=('6fd368c4f6c31752011a716cccd951601157a493'
+sha1sums=('819949fdf4276a04c5061b82898b515f139b0117'
'5bb6fa526665cdd728c26f0f282f5a51f220cf88'
'2db68906b603e5268736f48c8e251f3a49da1d75'
'83b3363878e3660ce23b2ad325b53cbd6c796ecf'
- '9907f9e815592837abc7fa3264a401567b7606ab'
+ 'f085a71f467e4d7cb2cf094d9369b0bcc4bab6ec'
'cdb830137192bbe002c6d01058656bd053ed0ddd'
'd9f9f06b46b4187648e860afa0552335aafe3ce4'
'c45b738b5ec4cfb11611b984c21a83b91a2d58f3'
@@ -40,9 +40,10 @@ sha1sums=('6fd368c4f6c31752011a716cccd951601157a493'
'7db53bb882f62f6c677cc8559cff83d8bae2ef73'
'ebbd1424a1564fd45f455a81c61ce348f0a14c2e'
'44626980a52e49f345a0b1e1ca03060f3a35763c'
- '5c4eb4ea88c302e8ff98f435a11dd59b00f4d8b9'
- 'f1f16f44c6a5547b6f251d13007fe6585761e8b0'
+ '5f2e76985a751f635a45612565a6e1bc9547398a'
+ 'fe6bbe214b3a13bd084f62a8ee9631fd8326c464'
'e7abda09c61142121b6695928d3b71ccd8fdf73a')
+
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
@@ -74,8 +75,9 @@ package() {
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
+ mkdir -p "${pkgdir}"/var/lib/{iptables,ip6tables}
install -m644 empty-{filter,mangle,nat,raw,security}.rules "${pkgdir}"/var/lib/iptables
+ install -m644 empty-{filter,mangle,nat,raw,security}.rules "${pkgdir}"/var/lib/ip6tables
# install systemd files
install -Dm644 ${srcdir}/iptables.service ${pkgdir}/usr/lib/systemd/system/iptables.service
diff --git a/core/iptables/ip6tables.service b/core/iptables/ip6tables.service
index 9a695f31e..60d76becf 100644
--- a/core/iptables/ip6tables.service
+++ b/core/iptables/ip6tables.service
@@ -4,6 +4,7 @@ Description=IPv6 Packet Filtering Framework
[Service]
Type=oneshot
ExecStart=/usr/sbin/ip6tables-restore /etc/iptables/ip6tables.rules
+ExecReload=/usr/sbin/ip6tables-restore /etc/iptables/ip6tables.rules
ExecStop=/usr/lib/systemd/scripts/iptables-flush 6
RemainAfterExit=yes
diff --git a/core/iptables/iptables.service b/core/iptables/iptables.service
index 3084f53b7..eb1a967f3 100644
--- a/core/iptables/iptables.service
+++ b/core/iptables/iptables.service
@@ -4,6 +4,7 @@ Description=Packet Filtering Framework
[Service]
Type=oneshot
ExecStart=/usr/sbin/iptables-restore /etc/iptables/iptables.rules
+ExecReload=/usr/sbin/iptables-restore /etc/iptables/iptables.rules
ExecStop=/usr/lib/systemd/scripts/iptables-flush
RemainAfterExit=yes
diff --git a/core/iptables/simple_firewall.rules b/core/iptables/simple_firewall.rules
index e1604cc36..63426b083 100644
--- a/core/iptables/simple_firewall.rules
+++ b/core/iptables/simple_firewall.rules
@@ -3,7 +3,7 @@
:FORWARD DROP [0:0]
:OUTPUT ACCEPT [0:0]
-A INPUT -p icmp -j ACCEPT
--A INPUT -m state --state RELATED,ESTABLISHED -j ACCEPT
+-A INPUT -m conntrack --ctstate RELATED,ESTABLISHED -j ACCEPT
-A INPUT -i lo -j ACCEPT
-A INPUT -p tcp -j REJECT --reject-with tcp-reset
-A INPUT -p udp -j REJECT --reject-with icmp-port-unreachable
diff --git a/core/krb5/PKGBUILD b/core/krb5/PKGBUILD
index f14875218..5f7a75608 100644
--- a/core/krb5/PKGBUILD
+++ b/core/krb5/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 173666 2012-12-20 14:18:03Z stephane $
+# $Id: PKGBUILD 174452 2013-01-04 16:47:52Z stephane $
# Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
pkgname=krb5
pkgver=1.11
-pkgrel=1
+pkgrel=2
pkgdesc="The Kerberos network authentication system"
arch=('i686' 'x86_64' 'mips64el')
url="http://web.mit.edu/kerberos/"
@@ -12,6 +12,7 @@ depends=('e2fsprogs' 'libldap' 'keyutils')
makedepends=('perl')
backup=('etc/krb5.conf' 'var/lib/krb5kdc/kdc.conf')
source=(http://web.mit.edu/kerberos/dist/${pkgname}/1.11/${pkgname}-${pkgver}-signed.tar
+ krb5-config_LDFLAGS.patch
krb5-kadmind
krb5-kadmind.service
krb5-kdc
@@ -21,6 +22,7 @@ source=(http://web.mit.edu/kerberos/dist/${pkgname}/1.11/${pkgname}-${pkgver}-si
krb5-kpropd@.service
krb5-kpropd.socket)
sha1sums=('dcdc305bd2b63cf8b8cb698cb9ea28f0a6282136'
+ '09e478cddfb9d46d2981dd25ef96b8c3fd91e1aa'
'2aa229369079ed1bbb201a1ef72c47bf143f4dbe'
'a2a01e7077d9e89cda3457ea0e216debb3dc353c'
'77d2312ecd8bf12a6e72cc8fd871a8ac93b23393'
@@ -35,6 +37,9 @@ build() {
tar zxvf ${pkgname}-${pkgver}.tar.gz
cd "${srcdir}/${pkgname}-${pkgver}/src"
+ # cf https://bugs.gentoo.org/show_bug.cgi?id=448778
+ patch -Np2 -i "${srcdir}"/krb5-config_LDFLAGS.patch
+
rm lib/krb5/krb/deltat.c
# FS#25384
diff --git a/core/krb5/krb5-config_LDFLAGS.patch b/core/krb5/krb5-config_LDFLAGS.patch
new file mode 100644
index 000000000..0b300cb44
--- /dev/null
+++ b/core/krb5/krb5-config_LDFLAGS.patch
@@ -0,0 +1,12 @@
+Bug #448778
+--- krb5-1.11/src/krb5-config.in 2012-12-18 02:47:04.000000000 +0000
++++ krb5-1.11/src/krb5-config.in 2012-12-28 07:13:16.582693363 +0000
+@@ -217,7 +217,7 @@
+ -e 's#\$(PROG_RPATH)#'$libdir'#' \
+ -e 's#\$(PROG_LIBPATH)#'$libdirarg'#' \
+ -e 's#\$(RPATH_FLAG)#'"$RPATH_FLAG"'#' \
+- -e 's#\$(LDFLAGS)#'"$LDFLAGS"'#' \
++ -e 's#\$(LDFLAGS)##' \
+ -e 's#\$(PTHREAD_CFLAGS)#'"$PTHREAD_CFLAGS"'#' \
+ -e 's#\$(CFLAGS)##'`
+
diff --git a/core/mpfr/PKGBUILD b/core/mpfr/PKGBUILD
index 00eb1cd04..4c9ccfd5d 100644
--- a/core/mpfr/PKGBUILD
+++ b/core/mpfr/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 165869 2012-09-02 01:16:10Z allan $
+# $Id: PKGBUILD 174749 2013-01-06 02:22:46Z allan $
# Maintainer: Allan McRae <allan@archlinux.org>
# Contributor: damir <damir@archlinux.org>
@@ -6,7 +6,7 @@ pkgname=mpfr
_pkgver=3.1.1
_patchlevel=p2
pkgver=${_pkgver}.${_patchlevel}
-pkgrel=1
+pkgrel=2
pkgdesc="Multiple-precision floating-point library"
arch=('i686' 'x86_64' 'mips64el')
url="http://www.mpfr.org/"
@@ -22,6 +22,7 @@ md5sums=('91d51c41fcf2799e4ee7a7126fc95c17'
build() {
cd "${srcdir}/${pkgname}-${_pkgver}"
+ patch -p1 -i $srcdir/mpfr-${_pkgver}-${_patchlevel}.patch
./configure --prefix=/usr --enable-thread-safe --enable-shared
make
}
diff --git a/core/patch/PKGBUILD b/core/patch/PKGBUILD
index d2852c447..8174e80eb 100644
--- a/core/patch/PKGBUILD
+++ b/core/patch/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 167281 2012-09-29 22:30:14Z allan $
+# $Id: PKGBUILD 174021 2013-01-01 15:15:16Z foutrelis $
# Maintainer: Allan McRae <allan@archlinux.org>
# Contributor: judd <jvinet@zeroflux.org>
pkgname=patch
pkgver=2.7.1
-pkgrel=1
+pkgrel=2
pkgdesc="A utility to apply patch files to original sources"
arch=('i686' 'x86_64' 'mips64el')
url="http://www.gnu.org/software/patch/patch.html"
@@ -13,12 +13,21 @@ groups=('base-devel')
depends=('glibc')
makedepends=('ed')
optdepends=('ed: for patch -e functionality')
-source=(ftp://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.xz{,.sig})
+source=(ftp://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.xz{,.sig}
+ patch-2.7.1-initialize-data-structures-early-enough.patch)
md5sums=('e9ae5393426d3ad783a300a338c09b72'
- 'b12189e0de3cb2af25268441647ec517')
+ 'b12189e0de3cb2af25268441647ec517'
+ 'dc6367a7cd49933d4006c246789e98da')
build() {
cd ${srcdir}/${pkgname}-${pkgver}
+
+ # Fix segfault on non-numeric strip-count
+ # (also segfaults on nonexistent directory passed to -d)
+ # http://savannah.gnu.org/bugs/?37500
+ patch -Np1 -i \
+ $srcdir/patch-2.7.1-initialize-data-structures-early-enough.patch
+
./configure --prefix=/usr
make
}
diff --git a/core/patch/patch-2.7.1-initialize-data-structures-early-enough.patch b/core/patch/patch-2.7.1-initialize-data-structures-early-enough.patch
new file mode 100644
index 000000000..046edc3d4
--- /dev/null
+++ b/core/patch/patch-2.7.1-initialize-data-structures-early-enough.patch
@@ -0,0 +1,81 @@
+From 291ec175812b7ba291d124e4cf2fbf9efec590c8 Mon Sep 17 00:00:00 2001
+From: Andreas Gruenbacher <agruen@linbit.com>
+Date: Thu, 4 Oct 2012 12:33:09 +0200
+Subject: [PATCH] Initialize data structures early enough
+
+* src/patch.c (main): Initialize data structures early enough, before error
+paths can access them.
+* tests/bad-usage: Test bad command line usage.
+* tests/Makefile.am (TESTS): Add bad-usage here.
+---
+ src/patch.c | 8 ++++----
+ tests/Makefile.am | 1 +
+ tests/bad-usage | 18 ++++++++++++++++++
+ 3 files changed, 23 insertions(+), 4 deletions(-)
+ create mode 100644 tests/bad-usage
+
+diff --git a/src/patch.c b/src/patch.c
+index 828943b..0255fbb 100644
+--- a/src/patch.c
++++ b/src/patch.c
+@@ -150,6 +150,10 @@ main (int argc, char **argv)
+ else if ((version_control = getenv ("VERSION_CONTROL")))
+ version_control_context = "$VERSION_CONTROL";
+
++ init_backup_hash_table ();
++ init_files_to_delete ();
++ init_files_to_output ();
++
+ /* parse switches */
+ Argc = argc;
+ Argv = argv;
+@@ -162,10 +166,6 @@ main (int argc, char **argv)
+ if (make_backups | backup_if_mismatch)
+ backup_type = get_version (version_control_context, version_control);
+
+- init_backup_hash_table ();
+- init_files_to_delete ();
+- init_files_to_output ();
+-
+ init_output (&outstate);
+ if (outfile)
+ outstate.ofp = open_outfile (outfile);
+diff --git a/tests/Makefile.am b/tests/Makefile.am
+index 02fc6de..5cea52d 100644
+--- a/tests/Makefile.am
++++ b/tests/Makefile.am
+@@ -20,6 +20,7 @@ TESTS = \
+ asymmetric-hunks \
+ backup-prefix-suffix \
+ bad-filenames \
++ bad-usage \
+ concat-git-diff \
+ copy-rename \
+ corrupt-reject-files \
+diff --git a/tests/bad-usage b/tests/bad-usage
+new file mode 100644
+index 0000000..022eeda
+--- /dev/null
++++ b/tests/bad-usage
+@@ -0,0 +1,18 @@
++# Copyright (C) 2009, 2011-2012 Free Software Foundation, Inc.
++#
++# Copying and distribution of this file, with or without modification,
++# in any medium, are permitted without royalty provided the copyright
++# notice and this notice are preserved.
++
++. $srcdir/test-lib.sh
++
++require_cat
++use_local_patch
++use_tmpdir
++
++# ==============================================================
++
++check 'patch -px || echo "status: $?"' <<EOF
++$PATCH: **** strip count x is not a number
++status: 2
++EOF
+--
+1.8.0.3
+
generated by cgit v1.2.3-54-g00ecf (git 2.45.2) at 2024-08-15 14:46:21 +0000