[arch-commits] Commit in traceroute/repos/testing-x86_64 (4 files)

[Anatol Pomozov]

    Date: Thursday, November 21, 2019 @ 09:11:33
  Author: anatolik
Revision: 369540

archrelease: copy trunk to testing-x86_64

Added:
  traceroute/repos/testing-x86_64/PKGBUILD
    (from rev 369539, traceroute/trunk/PKGBUILD)
  traceroute/repos/testing-x86_64/reproducible-build.patch
    (from rev 369539, traceroute/trunk/reproducible-build.patch)
Deleted:
  traceroute/repos/testing-x86_64/PKGBUILD
  traceroute/repos/testing-x86_64/reproducible-build.patch

--------------------------+
 PKGBUILD                 |   58 ++++++++++++++++++++++-----------------------
 reproducible-build.patch |   50 ++++++++++++++++++++++++++++----------
 2 files changed, 66 insertions(+), 42 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2019-11-21 09:10:53 UTC (rev 369539)
+++ PKGBUILD	2019-11-21 09:11:33 UTC (rev 369540)
@@ -1,29 +0,0 @@
-# Maintainer: Eric Bélanger <eric at archlinux.org>
-
-pkgname=traceroute
-pkgver=2.1.0
-pkgrel=4
-pkgdesc="Tracks the route taken by packets over an IP network"
-arch=('x86_64')
-url="http://traceroute.sourceforge.net/"
-license=('GPL2')
-depends=('glibc')
-source=(https://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz
-        reproducible-build.patch)
-sha1sums=('bc5c6c8022187511be5665b3818d919be5987dcc'
-          'ca5fc57ff373b26e9d2850ffd380f06618759eef')
-
-patch() {
-  cd ${pkgname}-${pkgver}
-  patch -p1 < ../reproducible-build.patch
-}
-
-build() {
-  cd ${pkgname}-${pkgver}
-  make CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS" LDFLAGS="$LDFLAGS"
-}
-
-package() {
-  cd ${pkgname}-${pkgver}
-  make prefix=/usr DESTDIR="${pkgdir}" install
-}

Copied: traceroute/repos/testing-x86_64/PKGBUILD (from rev 369539, traceroute/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2019-11-21 09:11:33 UTC (rev 369540)
@@ -0,0 +1,29 @@
+# Maintainer: Eric Bélanger <eric at archlinux.org>
+
+pkgname=traceroute
+pkgver=2.1.0
+pkgrel=5
+pkgdesc="Tracks the route taken by packets over an IP network"
+arch=('x86_64')
+url="http://traceroute.sourceforge.net/"
+license=('GPL2')
+depends=('glibc')
+source=(https://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz
+        reproducible-build.patch)
+sha1sums=('bc5c6c8022187511be5665b3818d919be5987dcc'
+          '49c777b929516dd72de8d518cfa97e7b88058750')
+
+prepare() {
+  cd ${pkgname}-${pkgver}
+  patch -p1 < ../reproducible-build.patch
+}
+
+build() {
+  cd ${pkgname}-${pkgver}
+  make CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS" LDFLAGS="$LDFLAGS"
+}
+
+package() {
+  cd ${pkgname}-${pkgver}
+  make prefix=/usr DESTDIR="${pkgdir}" install
+}

Deleted: reproducible-build.patch
===================================================================
--- reproducible-build.patch	2019-11-21 09:10:53 UTC (rev 369539)
+++ reproducible-build.patch	2019-11-21 09:11:33 UTC (rev 369540)
@@ -1,13 +0,0 @@
-diff --git a/Make.rules b/Make.rules
-index ce5b033..49cad28 100644
---- a/Make.rules
-+++ b/Make.rules
-@@ -166,7 +166,7 @@ endif
- endif
- endif
- 
--sources = $(wildcard *.c)
-+sources = $(sort $(wildcard *.c))
- OBJS = $(sources:.c=.$(obj))
- 
- 

Copied: traceroute/repos/testing-x86_64/reproducible-build.patch (from rev 369539, traceroute/trunk/reproducible-build.patch)
===================================================================
--- reproducible-build.patch	                        (rev 0)
+++ reproducible-build.patch	2019-11-21 09:11:33 UTC (rev 369540)
@@ -0,0 +1,37 @@
+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
+@@ -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
+ 
+-sources = $(wildcard *.c)
++sources = $(sort $(wildcard *.c))
+ 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