[-]
[+]
|
Changed |
_service:tar_git:libzypp.changes
|
|
[-]
[+]
|
Changed |
_service:tar_git:libzypp.spec
^
|
|
[-]
[+]
|
Deleted |
_service:tar_git:0001-zypp-PublicKey.cc-Use-GPG_BINARY-from-KeyRing.cc.patch
^
|
@@ -1,64 +0,0 @@
-From 50ed977e1b166ba23a029f3a5194121ea4d45dd7 Mon Sep 17 00:00:00 2001
-From: Thomas Perl <m@thp.io>
-Date: Fri, 6 Feb 2015 16:28:43 +0100
-Subject: [PATCH] zypp/PublicKey.cc: Use GPG_BINARY from KeyRing.cc
-
-On systems where "gpg" is not available, checking the public key
-would fail. Use GPG_BINARY in both PublicKey.cc and KeyRing.cc,
-and define it in a single place only (ExternalProgram.h).
-
-The original patch was partially integrated in upstream
-commit 092cded378742fcbb0761cc470da863cb32ed537, but only as a duplicated
-define in KeyRing and PublicKey. This patch now just moves the define to
-ExternalProgram.h
----
- zypp/ExternalProgram.h | 2 ++
- zypp/KeyRing.cc | 3 ---
- zypp/PublicKey.cc | 3 ---
- 3 files changed, 2 insertions(+), 6 deletions(-)
-
-diff --git a/zypp/ExternalProgram.h b/zypp/ExternalProgram.h
-index f3fc850..99a3143 100644
---- a/zypp/ExternalProgram.h
-+++ b/zypp/ExternalProgram.h
-@@ -22,6 +22,8 @@
- #include "zypp/base/ExternalDataSource.h"
- #include "zypp/Pathname.h"
-
-+#define GPG_BINARY "/usr/bin/gpg2"
-+
- namespace zypp {
-
- /**
-diff --git a/zypp/KeyRing.cc b/zypp/KeyRing.cc
-index d6b8246..826ce4c 100644
---- a/zypp/KeyRing.cc
-+++ b/zypp/KeyRing.cc
-@@ -35,9 +35,6 @@ using std::endl;
- #undef ZYPP_BASE_LOGGER_LOGGROUP
- #define ZYPP_BASE_LOGGER_LOGGROUP "zypp::KeyRing"
-
--/** \todo Fix duplicate define in PublicKey/KeyRing */
--#define GPG_BINARY "/usr/bin/gpg2"
--
- ///////////////////////////////////////////////////////////////////
- namespace zypp
- { /////////////////////////////////////////////////////////////////
-diff --git a/zypp/PublicKey.cc b/zypp/PublicKey.cc
-index fa17b79..fdbc95e 100644
---- a/zypp/PublicKey.cc
-+++ b/zypp/PublicKey.cc
-@@ -28,9 +28,6 @@
-
- #include <ctime>
-
--/** \todo Fix duplicate define in PublicKey/KeyRing */
--#define GPG_BINARY "/usr/bin/gpg2"
--
- using std::endl;
-
- ///////////////////////////////////////////////////////////////////
---
-1.8.3-rc3
-
-
|
[-]
[+]
|
Deleted |
_service:tar_git:0002-Diffs-14.35.0-10.patch
^
|
@@ -1,40 +0,0 @@
-diff --git a/zypp.conf b/zypp.conf
-index dfe7f64..5292843 100644
---- a/zypp.conf
-+++ b/zypp.conf
-@@ -199,7 +199,7 @@
- ##
- ## This option has no effect unless download.use_deltarpm is set true.
- ##
--# download.use_deltarpm.always = false
-+download.use_deltarpm.always = true
-
- ##
- ## Hint which media to prefer when installing packages (download vs. CD).
-@@ -427,6 +427,16 @@
- # solver.checkSystemFile = /etc/zypp/systemCheck
-
- ##
-+## This directory can contain files that contain requirements/conflicts
-+## which fulfill the needs of a running system (see checkSystemFile).
-+##
-+## Files are read in alphabetical order.
-+##
-+## Default value: {configdir}/systemCheck.d
-+##
-+# solver.checkSystemFileDir = /etc/zypp/systemCheck.d
-+
-+##
- ## When committing a dist upgrade (e.g. 'zypper dup') a solver testcase
- ## is written to /var/log/updateTestcase-<date>. It is needed in bugreports.
- ## This option returns the number of testcases to keep on the system. Old
-@@ -595,7 +505,7 @@ multiversion.kernels = latest,latest-1,running
- ## Valid values: boolean
- ## Default value: no
- ##
--# rpm.install.excludedocs = no
-+rpm.install.excludedocs = yes
-
- ##
- ## Location of history log file.
-
|
[-]
[+]
|
Changed |
_service:tar_git:aarch64.patch
^
|
@@ -1,14 +1,70 @@
-Index: zypp/ZConfig.cc
+Index: zypp/Arch.cc
===================================================================
---- zypp.orig/ZConfig.cc
-+++ zypp/ZConfig.cc
-@@ -133,7 +133,8 @@ namespace zypp
- ERR << "Cant open " << PathInfo("/proc/cpuinfo") << endl;
- }
- }
-- else if ( architecture == Arch_armv7l || architecture == Arch_armv6l )
-+ else if ( architecture == Arch_armv7l || architecture == Arch_armv6l ||
-+ architecture == Arch_aarch64 )
- {
- std::ifstream platform( "/etc/rpm/platform" );
- if (platform)
+--- zypp.orig/Arch.cc
++++ zypp/Arch.cc
+@@ -187,6 +187,8 @@ namespace zypp
+ DEF_BUILTIN( sparcv8 );
+ DEF_BUILTIN( sparc );
+
++ DEF_BUILTIN( aarch64 );
++
+ DEF_BUILTIN( armv7tnhl );
+ DEF_BUILTIN( armv7thl );
+ DEF_BUILTIN( armv7nhl );
+@@ -325,6 +327,8 @@ namespace zypp
+ defCompatibleWith( _armv7nhl(), _noarch(),_armv7hl() );
+ defCompatibleWith( _armv7thl(), _noarch(),_armv7hl() );
+ defCompatibleWith( _armv7tnhl(), _noarch(),_armv7hl(),_armv7nhl(),_armv7thl() );
++
++ defCompatibleWith( _aarch64(), _noarch() );
+ //
+ defCompatibleWith( _sh3(), _noarch() );
+ //
+@@ -430,6 +434,8 @@ namespace zypp
+ const Arch Arch_sparcv8( _sparcv8() );
+ const Arch Arch_sparc( _sparc() );
+
++ const Arch Arch_aarch64( _aarch64() );
++
+ const Arch Arch_armv7tnhl( _armv7tnhl() );
+ const Arch Arch_armv7thl( _armv7thl() );
+ const Arch Arch_armv7nhl ( _armv7nhl() );
+Index: zypp/Arch.h
+===================================================================
+--- zypp.orig/Arch.h
++++ zypp/Arch.h
+@@ -222,6 +222,9 @@ namespace zypp
+ extern const Arch Arch_sparc;
+
+ /** \relates Arch */
++ extern const Arch Arch_aarch64;
++
++ /** \relates Arch */
+ extern const Arch Arch_armv7tnhl;
+ /** \relates Arch */
+ extern const Arch Arch_armv7thl;
+Index: zypp/parser/yum/schema/common-inc.rnc
+===================================================================
+--- zypp.orig/parser/yum/schema/common-inc.rnc
++++ zypp/parser/yum/schema/common-inc.rnc
+@@ -51,6 +51,7 @@ private.archenum = "noarch"
+ | "sparcv9"
+ | "sparcv8"
+ | "sparc"
++ | "aarch64"
+ | "armv7tnhl"
+ | "armv7thl"
+ | "armv7nhl"
+Index: zypp/parser/yum/schema/common-inc.rng
+===================================================================
+--- zypp.orig/parser/yum/schema/common-inc.rng
++++ zypp/parser/yum/schema/common-inc.rng
+@@ -114,6 +114,7 @@
+ <value>sparcv9</value>
+ <value>sparcv8</value>
+ <value>sparc</value>
++ <value>aarch64</value>
+ <value>armv7tnhl</value>
+ <value>armv7thl</value>
+ <value>armv7nhl</value>
+
|
[-]
[+]
|
Changed |
_service
^
|
@@ -2,7 +2,7 @@
<service name="tar_git">
<param name="url">https://git.merproject.org/aa13q/libzypp</param>
<param name="branch">master</param>
- <param name="revision">e9f65d4001a20a7bf511fe1f19692b255a6d8412</param>
+ <param name="revision">ff6d67dacdfb240cefdb38b7fdf06e7e974fdb98</param>
<param name="dumb">N</param>
</service>
</services>
|
|
Added |
_service:tar_git:libzypp-12.2.0+git5+aarch64.tar.bz2
^
|
|
Deleted |
_service:tar_git:libzypp-14.35.0+master.20170521010510.4.ge9f65d4.tar.bz2
^
|