Date: Saturday, October 29, 2022 @ 10:23:12
Author: andyrtr
Revision: 459425
archrelease: copy trunk to testing-x86_64
Added:
xmlsec/repos/testing-x86_64/0002_remove_test_nssdb.patch
(from rev 459424, xmlsec/trunk/0002_remove_test_nssdb.patch)
xmlsec/repos/testing-x86_64/PKGBUILD
(from rev 459424, xmlsec/trunk/PKGBUILD)
Deleted:
xmlsec/repos/testing-x86_64/0002_remove_test_nssdb.patch
xmlsec/repos/testing-x86_64/PKGBUILD
------------------------------+
0002_remove_test_nssdb.patch | 58 +++++++++++++-------------
PKGBUILD | 89 ++++++++++++++++-------------------------
2 files changed, 65 insertions(+), 82 deletions(-)
Deleted: 0002_remove_test_nssdb.patch
===================================================================
--- 0002_remove_test_nssdb.patch 2022-10-29 10:23:00 UTC (rev 459424)
+++ 0002_remove_test_nssdb.patch 2022-10-29 10:23:12 UTC (rev 459425)
@@ -1,29 +0,0 @@
-diff --git a/tests/testKeys.sh b/tests/testKeys.sh
-index 8424e8d6d..af3ee8a01 100755
---- a/tests/testKeys.sh
-+++ b/tests/testKeys.sh
-@@ -22,11 +22,8 @@ echo "--- LTDL_LIBRARY_PATH=$LTDL_LIBRARY_PATH" >> $logfile
- mkdir -p $crypto_config
- rm -rf $crypto_config/*
-
--# remove old keys file and copy NSS DB files if needed
-+# remove old keys file
- rm -rf $keysfile
--if [ "z$crypto" = "znss" ] ; then
-- cp -f $nssdbfolder/*.db $crypto_config
--fi
-
- ##########################################################################
- ##########################################################################
-diff --git a/tests/testrun.sh b/tests/testrun.sh
-index ed79e608c..05ed22974 100755
---- a/tests/testrun.sh
-+++ b/tests/testrun.sh
-@@ -37,7 +37,6 @@ else
- curlogfile=$TMPFOLDER/$testname.$timestamp-$$.cur.log
- failedlogfile=$TMPFOLDER/$testname.$timestamp-$$.failed.log
- fi
--nssdbfolder=$topfolder/nssdb
-
- #
- # Valgrind
Copied: xmlsec/repos/testing-x86_64/0002_remove_test_nssdb.patch (from rev
459424, xmlsec/trunk/0002_remove_test_nssdb.patch)
===================================================================
--- 0002_remove_test_nssdb.patch (rev 0)
+++ 0002_remove_test_nssdb.patch 2022-10-29 10:23:12 UTC (rev 459425)
@@ -0,0 +1,29 @@
+diff --git a/tests/testKeys.sh b/tests/testKeys.sh
+index 8424e8d6d..af3ee8a01 100755
+--- a/tests/testKeys.sh
++++ b/tests/testKeys.sh
+@@ -22,11 +22,8 @@ echo "--- LTDL_LIBRARY_PATH=$LTDL_LIBRARY_PATH" >> $logfile
+ mkdir -p $crypto_config
+ rm -rf $crypto_config/*
+
+-# remove old keys file and copy NSS DB files if needed
++# remove old keys file
+ rm -rf $keysfile
+-if [ "z$crypto" = "znss" ] ; then
+- cp -f $nssdbfolder/*.db $crypto_config
+-fi
+
+ ##########################################################################
+ ##########################################################################
+diff --git a/tests/testrun.sh b/tests/testrun.sh
+index ed79e608c..05ed22974 100755
+--- a/tests/testrun.sh
++++ b/tests/testrun.sh
+@@ -37,7 +37,6 @@ else
+ curlogfile=$TMPFOLDER/$testname.$timestamp-$$.cur.log
+ failedlogfile=$TMPFOLDER/$testname.$timestamp-$$.failed.log
+ fi
+-nssdbfolder=$topfolder/nssdb
+
+ #
+ # Valgrind
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2022-10-29 10:23:00 UTC (rev 459424)
+++ PKGBUILD 2022-10-29 10:23:12 UTC (rev 459425)
@@ -1,53 +0,0 @@
-# Maintainer: AndyRTR <[email protected]>
-# Contributor: Jan de Groot <[email protected]>
-# Contributor: Hussam Al-Tayeb <[email protected]>
-
-pkgname=xmlsec
-pkgver=1.2.35
-pkgrel=1
-pkgdesc="XML Security Library is a C library based on LibXML2"
-license=('custom')
-arch=('x86_64')
-url="https://www.aleksey.com/xmlsec/index.html";
-depends=('libxslt' 'openssl' 'gnutls' 'nss' 'libltdl')
-provides=('libxmlsec1.so' 'libxmlsec1-openssl.so' 'libxmlsec1-nss.so'
'libxmlsec1-gnutls.so' 'libxmlsec1-gcrypt.so')
-options=('debug')
-#source=(https://www.aleksey.com/xmlsec/download/${pkgname}1-${pkgver}.{tar.gz,sig})
# signature file not compatible
-source=(https://www.aleksey.com/xmlsec/download/${pkgname}1-${pkgver}.tar.gz
-
0001_xmlsec_1.2.35-buildfix.patch::https://patch-diff.githubusercontent.com/raw/lsh123/xmlsec/pull/412.patch
-
#0002_remove_test_nssdb.patch::https://patch-diff.githubusercontent.com/raw/lsh123/xmlsec/pull/418.patch
- 0002_remove_test_nssdb.patch
-)
-sha256sums=('a39f86f6fe8e8cdc998b9a911ef1fae03f57a9ef99c2b704cd492007a52ac223'
- 'bf62a51337a3bad0b1a81311edf1dc0d74cb78b05ed0e49ed4c0d9507fed1b03'
- '693737c12b2c95c437816d8b6f0c95a81772100a5b43f918ff842b5bd89138e9')
-#validpgpkeys=('') #
-
-prepare() {
- cd ${pkgname}1-${pkgver}
- # build fix / https://github.com/lsh123/xmlsec/issues/411
- patch -Np1 -i ../0001_xmlsec_1.2.35-buildfix.patch
- # https://github.com/lsh123/xmlsec/issues/415
- rm tests/nssdb/cert8.db tests/nssdb/key3.db tests/nssdb/secmod.db
- patch -Np1 -i ../0002_remove_test_nssdb.patch
-}
-
-build() {
- cd ${pkgname}1-${pkgver}
- ./configure --prefix=/usr --disable-static
- sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
- make
-}
-
-check() {
- cd ${pkgname}1-$pkgver
- # tests run in fakeroot fail expected in xmlsec-gcrypt
- # https://github.com/lsh123/xmlsec/issues/415
- make -k check || /bin/true
-}
-
-package() {
- cd ${pkgname}1-${pkgver}
- make DESTDIR="${pkgdir}" install
- install -Dm644 COPYING -t "${pkgdir}/usr/share/licenses/${pkgname}"
-}
Copied: xmlsec/repos/testing-x86_64/PKGBUILD (from rev 459424,
xmlsec/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2022-10-29 10:23:12 UTC (rev 459425)
@@ -0,0 +1,36 @@
+# Maintainer: AndyRTR <[email protected]>
+# Contributor: Jan de Groot <[email protected]>
+# Contributor: Hussam Al-Tayeb <[email protected]>
+
+pkgname=xmlsec
+pkgver=1.2.36
+pkgrel=1
+pkgdesc="XML Security Library is a C library based on LibXML2"
+license=('custom')
+arch=('x86_64')
+url="https://www.aleksey.com/xmlsec/index.html";
+depends=('libxslt' 'openssl' 'gnutls' 'nss' 'libltdl')
+provides=('libxmlsec1.so' 'libxmlsec1-openssl.so' 'libxmlsec1-nss.so'
'libxmlsec1-gnutls.so' 'libxmlsec1-gcrypt.so')
+options=('debug')
+#source=(https://www.aleksey.com/xmlsec/download/${pkgname}1-${pkgver}.{tar.gz,sig})
# signature file not compatible
+source=(https://www.aleksey.com/xmlsec/download/${pkgname}1-${pkgver}.tar.gz)
+sha256sums=('f0d97e008b211d85808f038326d42e7f5cf46648e176f07406a323e7e8d41c80')
+#validpgpkeys=('') #
+
+build() {
+ cd ${pkgname}1-${pkgver}
+ ./configure --prefix=/usr --disable-static
+ sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
+ make
+}
+
+check() {
+ cd ${pkgname}1-$pkgver
+ make check
+}
+
+package() {
+ cd ${pkgname}1-${pkgver}
+ make DESTDIR="${pkgdir}" install
+ install -Dm644 COPYING -t "${pkgdir}/usr/share/licenses/${pkgname}"
+}
