From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sun, 16 Oct 2016 20:28:47 +0000 (-0400)
Subject: pakfire: Update to 0.9.27
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2b084788ed858bde6ffe4a5186adbe565632c0ff;p=ipfire-3.x.git

pakfire: Update to 0.9.27

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---

diff --git a/pakfire/pakfire.nm b/pakfire/pakfire.nm
index 21e2bfacb..ffd9cbc23 100644
--- a/pakfire/pakfire.nm
+++ b/pakfire/pakfire.nm
@@ -4,8 +4,8 @@
 ###############################################################################
 
 name       = pakfire
-version    = 0.9.26
-release    = 3.1
+version    = 0.9.27
+release    = 1
 
 maintainer = Michael Tremer <michael.tremer@ipfire.org>
 groups     = System/Packaging
@@ -55,6 +55,11 @@ build
 		# Remove all example repository definitions.
 		# Those will be solely provided by system-release.
 		rm -rfv %{BUILDROOT}%{sysconfdir}/pakfire/repos/*
+
+		mkdir -pv %{BUILDROOT}%{datadir}/pakfire
+		for i in $(find %{datadir}/automake-* -name config.guess -or -name config.sub); do
+			cp -vf ${i} %{BUILDROOT}%{datadir}/pakfire/
+		done
 	end
 end
 
diff --git a/pakfire/patches/0001-CFLAGS-Enable-more-hardening.patch b/pakfire/patches/0001-CFLAGS-Enable-more-hardening.patch
deleted file mode 100644
index bab8cb516..000000000
--- a/pakfire/patches/0001-CFLAGS-Enable-more-hardening.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-commit 664591620ddc73ac6838c6ed152c2b3c4233d609
-Author: Michael Tremer <michael.tremer@ipfire.org>
-Date:   Tue Sep 16 15:49:25 2014 +0200
-
-    CFLAGS: Enable more hardening
-    
-    -fstack-protector-strong is available since GCC 4.9
-    
-    -D_FORTIFY_SOURCE=2 is automatically enabled in IPFire since
-    GCC 4.9 and when optimization is enabled (e.g. -O2).
-
-diff --git a/macros/cflags.macro b/macros/cflags.macro
-index a2c583c..52a069a 100644
---- a/macros/cflags.macro
-+++ b/macros/cflags.macro
-@@ -1,7 +1,8 @@
- 
- # Export CFLAGS + CXXFLAGS
--GLOBAL_CFLAGS   = -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fPIC
--GLOBAL_CFLAGS  += -fstack-protector-all --param=ssp-buffer-size=4
-+GLOBAL_CFLAGS   = -O2 -g -pipe -Wall -Werror=format-security
-+GLOBAL_CFLAGS  += -fexceptions -fPIC -fstack-protector-strong --param=ssp-buffer-size=4
-+GLOBAL_CFLAGS  += -grecord-gcc-switches
- 
- CFLAGS_i686     = -m32 -march=i686 -mtune=atom -fasynchronous-unwind-tables
- CFLAGS_x86_64   = -m64 -mtune=generic
diff --git a/pakfire/patches/0001-Fix-database-conversion.patch b/pakfire/patches/0001-Fix-database-conversion.patch
deleted file mode 100644
index 3ba055889..000000000
--- a/pakfire/patches/0001-Fix-database-conversion.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 32468054fe6aa6d181388252ac4c3f6286dfacf1 Mon Sep 17 00:00:00 2001
-From: Michael Tremer <michael.tremer@ipfire.org>
-Date: Wed, 25 Sep 2013 00:51:36 +0100
-Subject: [PATCH] Fix database conversion.
-
-The new dependencies table was not correctly generated
-from older databases, which is fixed in this patch.
----
- src/pakfire/repository/database.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/pakfire/repository/database.py b/src/pakfire/repository/database.py
-index d22bdb5..379ae1c 100644
---- a/src/pakfire/repository/database.py
-+++ b/src/pakfire/repository/database.py
-@@ -281,7 +281,7 @@ class DatabaseLocal(Database):
- 
- 				for type, deps in dependencies:
- 					c.executemany("INSERT INTO dependencies(pkg, type, dependency) VALUES(?, ?, ?)",
--						((pkg_id, type, d) for d in deps))
-+						((pkg_id, type, d) for d in deps.splitlines()))
- 
- 			c.executescript("""
- 				CREATE TABLE packages_(
--- 
-1.8.3.1
-
diff --git a/pakfire/patches/0002-pakfire-perl_version.patch b/pakfire/patches/0002-pakfire-perl_version.patch
deleted file mode 100644
index 6b5faeae4..000000000
--- a/pakfire/patches/0002-pakfire-perl_version.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-commit 582d5734cfcd11de7563366f9788ea72803277e6
-Author: Stefan Schantl <stefan.schantl@ipfire.org>
-Date:   Sat Apr 4 15:33:58 2015 +0200
-
-    perl.macro: Add "perl_version".
-    
-    This variable is used to store the current used perl version, which
-    will be used in various external perl modules to track API dependencies.
-
-diff --git a/macros/perl.macro b/macros/perl.macro
-index b29e028..aa8fa81 100644
---- a/macros/perl.macro
-+++ b/macros/perl.macro
-@@ -7,6 +7,7 @@ perl_vendorarch = %(eval "$(%{perl} -V:installvendorarch)"; echo ${installvendor
- perl_vendorlib  = %(eval "$(%{perl} -V:installvendorlib)";  echo ${installvendorlib})
- perl_archlib    = %(eval "$(%{perl} -V:installarchlib)";    echo ${installarchlib})
- perl_privlib    = %(eval "$(%{perl} -V:installprivlib)";    echo ${installprivlib})
-+perl_version    = %(eval "$(%{perl} -V:version)";           echo ${version})
- 
- perl_all_paths  = {%{perl_vendorarch},%{perl_vendorlib},%{perl_archlib},%{perl_privlib}}
-