[arch-commits] Commit in traceroute/trunk (PKGBUILD reproducible-build.patch)

[Anatol Pomozov]

    Date: Thursday, November 21, 2019 @ 09:10:53
  Author: anatolik
Revision: 369539

Pull reproducible build patch from Debian

Fix PKGBUILD to use correct prepare() function 

Modified:
  traceroute/trunk/PKGBUILD
  traceroute/trunk/reproducible-build.patch

--------------------------+
 PKGBUILD                 |    6 +++---
 reproducible-build.patch |   30 +++++++++++++++++++++++++++---
 2 files changed, 30 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-11-21 09:09:28 UTC (rev 369538)
+++ PKGBUILD	2019-11-21 09:10:53 UTC (rev 369539)
@@ -2,7 +2,7 @@
 
 pkgname=traceroute
 pkgver=2.1.0
-pkgrel=4
+pkgrel=5
 pkgdesc="Tracks the route taken by packets over an IP network"
 arch=('x86_64')
 url="http://traceroute.sourceforge.net/"
@@ -11,9 +11,9 @@
 source=(https://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz
         reproducible-build.patch)
 sha1sums=('bc5c6c8022187511be5665b3818d919be5987dcc'
-          'ca5fc57ff373b26e9d2850ffd380f06618759eef')
+          '49c777b929516dd72de8d518cfa97e7b88058750')
 
-patch() {
+prepare() {
   cd ${pkgname}-${pkgver}
   patch -p1 < ../reproducible-build.patch
 }

Modified: reproducible-build.patch
===================================================================
--- reproducible-build.patch	2019-11-21 09:09:28 UTC (rev 369538)
+++ reproducible-build.patch	2019-11-21 09:10:53 UTC (rev 369539)
@@ -1,8 +1,21 @@
-diff --git a/Make.rules b/Make.rules
-index ce5b033..49cad28 100644
+Author: Reiner Herrmann <reiner at reiner-h.de>
+Description: Sort lists of libraries/source/object files
+ for deterministic linking order
+
 --- a/Make.rules
 +++ b/Make.rules
-@@ -166,7 +166,7 @@ endif
+@@ -136,8 +136,8 @@
+ _libs = $(strip $(foreach _lib,$(LIBDIRS),\
+ 		    $(if $(filter lib%,$(_lib)),\
+ 			$(patsubst lib%,-l%,$(_lib)),\
+-			$(wildcard $(srcdir)/$(_lib)/$(_lib).so \
+-					$(srcdir)/$(_lib)/$(_lib).a))))
++			$(sort $(wildcard $(srcdir)/$(_lib)/$(_lib).so \
++					$(srcdir)/$(_lib)/$(_lib).a)))))
+ 
+ override LIBS := $(_libs) -lm $(LIBS)
+ 
+@@ -166,7 +166,7 @@
  endif
  endif
  
@@ -11,3 +24,14 @@
  OBJS = $(sources:.c=.$(obj))
  
  
+--- a/default.rules
++++ b/default.rules
+@@ -143,7 +143,7 @@
+ ifeq ($(filter $(TARGET),$(EXEDIRS)),$(TARGET))
+ 
+ ifeq ($(filter $(TARGET),$(MODUSERS)),$(TARGET))
+-MOD_OBJS = $(wildcard $(foreach dir,$(MODDIRS),$(srcdir)/$(dir)/*.o))
++MOD_OBJS = $(sort $(wildcard $(foreach dir,$(MODDIRS),$(srcdir)/$(dir)/*.o)))
+ ifeq ($(shared),yes)
+ override LDFLAGS := -rdynamic $(LDFLAGS)
+ endif