aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2015-04-27 10:01:39 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2015-04-27 10:01:39 +0000
commit343afb6beb1113e7f7e9c876921cb6dbae8efeb6 (patch)
tree2fe39fb99d8d8a010e388d1960ad70e963b4bb2d
parent0e1ded7150d46ce84415e38fcb328eb7433950e4 (diff)
downloadaports-343afb6beb1113e7f7e9c876921cb6dbae8efeb6.tar.gz
aports-343afb6beb1113e7f7e9c876921cb6dbae8efeb6.tar.bz2
aports-343afb6beb1113e7f7e9c876921cb6dbae8efeb6.tar.xz
main/jwhois: use system snprintf
Using snprintf from gnulib will make fortify break. We simply remove use of gnulib since the only functions used is snprintf.
-rw-r--r--main/jwhois/APKBUILD16
-rw-r--r--main/jwhois/no-gnulib.patch52
2 files changed, 65 insertions, 3 deletions
diff --git a/main/jwhois/APKBUILD b/main/jwhois/APKBUILD
index 7edeef5259..200877020a 100644
--- a/main/jwhois/APKBUILD
+++ b/main/jwhois/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: William Pitcock <nenolod@dereferenced.org>
pkgname=jwhois
pkgver=4.0
-pkgrel=3
+pkgrel=4
pkgdesc="WHOIS/RWHOIS client"
url="http://www.gnu.org/software/jwhois/"
license="GPL"
@@ -11,7 +11,8 @@ install=
subpackages="$pkgname-doc"
source="http://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.gz
automake.patch
- jwhois-libiconv.patch"
+ jwhois-libiconv.patch
+ no-gnulib.patch"
arch="all"
_builddir="$srcdir/$pkgname-$pkgver"
@@ -49,4 +50,13 @@ package() {
md5sums="977d0ba90ee058a7998c94d933fc9546 jwhois-4.0.tar.gz
0dea1e6255b1b826043c8784882b2048 automake.patch
-f861d1891a718f3b370e1ac032b0b337 jwhois-libiconv.patch"
+f861d1891a718f3b370e1ac032b0b337 jwhois-libiconv.patch
+ab40914af91fd2e4266206e857aa6da5 no-gnulib.patch"
+sha256sums="fa9bb86782b915c6d730bb723f876dc9b345a617db375aaf3416ec22553cd64e jwhois-4.0.tar.gz
+ebbbb6819eb126c8ad55a7765508ec8f5dedd4a117fd459f2a0cf25be0529335 automake.patch
+b20d56512f2e196fd9b396cc8a86bcd690be696bac8410b6950c42f79799a272 jwhois-libiconv.patch
+7979c9aa651e8a7fb213fc0d2e24f4b3dc07e86d80192022a3c2e7135086b01a no-gnulib.patch"
+sha512sums="5d625c3f1031a8eb8ef766ef5d47a8c1a4396d1ad3344fc9449f80dd71ad84aadf21ba67f5c2f99348f732a4df998eefe699fcec4efcadf87f579b70302a44ae jwhois-4.0.tar.gz
+28d191d01569b68e3453e116fb7294405c38be6c3cea7bc4e3bb8039e823e0af3919501a8291512f4c0b8990b57f6711dc347a432cf9833fe9dcf402358def92 automake.patch
+0daee64f91c8dfd6faa4ad751889aaf10805d7b127bd62856112bdcdd9cb4b29c2e2e62d58a9843cd4d511648c2264a1d47f42137bca8ed59d5a6a7d803c857d jwhois-libiconv.patch
+60f081d544044ba2ab91f231df0c8facf76b89b406906b61d5b395ca3d299a0d712cd177fe98464db918803500e5f149a4eac44932e47f8cede4ab162bea638e no-gnulib.patch"
diff --git a/main/jwhois/no-gnulib.patch b/main/jwhois/no-gnulib.patch
new file mode 100644
index 0000000000..f4610214f1
--- /dev/null
+++ b/main/jwhois/no-gnulib.patch
@@ -0,0 +1,52 @@
+--- ./configure.ac.orig
++++ ./configure.ac
+@@ -88,7 +88,6 @@
+ AC_PROG_INSTALL
+ AC_PROG_CC
+ AC_PROG_RANLIB
+-gl_EARLY
+
+ GETTEXT_PACKAGE=jwhois
+ AC_SUBST(GETTEXT_PACKAGE)
+@@ -209,14 +208,11 @@
+ OLDCFLAGS=$CFLAGS
+ AC_SUBST(OLDCFLAGS)
+
+-gl_INIT
+-
+ AC_OUTPUT([ po/Makefile.in m4/Makefile
+ Makefile
+ doc/Makefile
+ doc/sv/Makefile
+ src/Makefile
+-gl/Makefile
+ example/Makefile
+ jwhois.spec
+ ])
+--- ./Makefile.am.orig
++++ ./Makefile.am
+@@ -19,9 +19,8 @@
+ ##
+
+ EXTRA_DIST = config.rpath m4/ChangeLog config.rpath include/*.h example/jwhois.conf m4/*.m4 jwhois.spec.in jwhois.spec
+-SUBDIRS = m4 doc gl src example po
++SUBDIRS = m4 doc src example po
+
+-AM_CPPFLAGS = -I$(top_srcdir)/gl
+ LDADD = lib/libgnu.a
+
+-ACLOCAL_AMFLAGS = -I m4 -I gl/m4
++ACLOCAL_AMFLAGS = -I m4
+--- ./src/Makefile.am.orig
++++ ./src/Makefile.am
+@@ -30,9 +30,7 @@
+ -DLOCALSTATEDIR="\"$(localstatedir)\"" \
+ -DLOCALEDIR="\"$(localedir)\""
+
+-jwhois_LDADD = $(top_srcdir)/gl/libgnu.a
+-
+ AM_CFLAGS = $(jwhois_CFLAGS)
+
+
+-INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/intl -I$(top_srcdir)/gl
++INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/intl