summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorhaawda2020-02-06 15:53:16 +0100
committerhaawda2020-02-06 15:53:16 +0100
commit6f56f9dbd3c7b6ce0bf850087968bf45cfa2df9e (patch)
treef4b7179d885f47cbdb002bdca8e3091420e0e2bc
parent839a8a516c46d5d2a1414760fa387d169e44d154 (diff)
downloadaur-6f56f9dbd3c7b6ce0bf850087968bf45cfa2df9e.tar.gz
undo hardcoding of CARCH, add full RELRO
-rw-r--r--.SRCINFO7
-rw-r--r--Makefile.patch12
-rw-r--r--PKGBUILD16
3 files changed, 25 insertions, 10 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 440f44e99b64..c8493a8e3e1b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = pdftk-gcj
pkgdesc = Tool for doing everyday things with PDF documents
pkgver = 2.02
- pkgrel = 4
+ pkgrel = 5
url = http://www.pdfhacks.com/pdftk
arch = x86_64
license = GPL
@@ -9,13 +9,14 @@ pkgbase = pdftk-gcj
depends = gcc6-gcj
depends = gcc-gcj-ecj
provides = pdftk
- options = !makeflags
source = http://www.pdflabs.com/tools/pdftk-the-pdf-toolkit/pdftk-2.02-src.zip
source = Makefile.Arch
+ source = Makefile.patch
source = pdftk
sha1sums = a4a27e984c5e1401cfa44b8e92a64113d7396a06
sha1sums = 0c8e1a442d266eb6782349e41652c6c07464222e
- sha1sums = 24479621dd7bfcfd455ced7272ffa64f99afe9a4
+ sha1sums = 195c2b05023c0449f07c6748b503d33eb8dcf72b
+ sha1sums = 668240583dc4f8564edd5eaec3c769ec6fdd4cc0
pkgname = pdftk-gcj
diff --git a/Makefile.patch b/Makefile.patch
new file mode 100644
index 000000000000..c98b0ba0c103
--- /dev/null
+++ b/Makefile.patch
@@ -0,0 +1,12 @@
+diff -Naur pdftk-2.02-orig/pdftk/Makefile.Base pdftk-2.02-new/pdftk/Makefile.Base
+--- pdftk-2.02-orig/pdftk/Makefile.Base 2013-07-23 23:48:52.000000000 +0200
++++ pdftk-2.02-new/pdftk/Makefile.Base 2020-02-06 15:04:03.471637847 +0100
+@@ -46,7 +46,7 @@
+ $(CXX) $(CPPFLAGS) $(CXXFLAGS) -I$(JAVALIBPATH) pdftk.cc -c
+
+ pdftk : pdftk.o attachments.o report.o passwords.o $(JAVALIB) $(LIBGCJ_SUPPLEMENT_FULL_O)
+- $(CXX) $(CXXFLAGS) attachments.o report.o passwords.o pdftk.o $(JAVALIB) $(LIBGCJ_SUPPLEMENT_FULL_O) $(LDLIBS) -o pdftk
++ $(CXX) $(CXXFLAGS) attachments.o report.o passwords.o pdftk.o $(JAVALIB) $(LIBGCJ_SUPPLEMENT_FULL_O) $(LDLIBS) -Wl,-z,relro,-z,now -o pdftk
+
+ install:
+ /usr/bin/install pdftk /usr/local/bin
diff --git a/PKGBUILD b/PKGBUILD
index f7187b9a47b2..3ecce07c9b1a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,30 +1,32 @@
-# Maintainer: Joey Dumont <joey.dumont@gmail.com>
+# Contributor: Joey Dumont <joey.dumont@gmail.com>
# Contributor: osc
-# Contributor: StefanHusmann
+# Maintainer: Stefan Husmann <stefan-husmann@t-online.de>
# Contributor: larsrh <hupel@in.tum.de>
pkgname=pdftk-gcj
_pkgname=pdftk
pkgver=2.02
-pkgrel=4
+pkgrel=5
pkgdesc="Tool for doing everyday things with PDF documents"
arch=('x86_64')
url="http://www.pdfhacks.com/pdftk"
license=('GPL')
depends=('gcc6-libs' 'gcc6-gcj' 'gcc-gcj-ecj')
provides=('pdftk')
-options=('!makeflags')
source=("http://www.pdflabs.com/tools/pdftk-the-pdf-toolkit/${_pkgname}-${pkgver}-src.zip"
- "Makefile.Arch"
- "pdftk"
+ 'Makefile.Arch' 'Makefile.patch'
+ 'pdftk'
)
sha1sums=('a4a27e984c5e1401cfa44b8e92a64113d7396a06'
'0c8e1a442d266eb6782349e41652c6c07464222e'
- '24479621dd7bfcfd455ced7272ffa64f99afe9a4')
+ '195c2b05023c0449f07c6748b503d33eb8dcf72b'
+ '668240583dc4f8564edd5eaec3c769ec6fdd4cc0')
prepare() {
cd ${_pkgname}-$pkgver-dist/${_pkgname}
cp "$srcdir"/Makefile.Arch .
+ cd ..
+ patch -Np1 < "$srcdir"/Makefile.patch
}
build() {