aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrancesco Colista <fcolista@alpinelinux.org>2021-05-20 14:50:11 +0000
committerFrancesco Colista <fcolista@alpinelinux.org>2021-05-20 14:50:26 +0000
commitd545f822821e27a507d1da76c59cd50cdbbf9c62 (patch)
tree78c08a150f8dfb45161e2109a8eb10ae6695a974
parent211bd678b6fcfb121f84e889a513db12e2b4a1b5 (diff)
downloadaports-d545f822821e27a507d1da76c59cd50cdbbf9c62.tar.gz
aports-d545f822821e27a507d1da76c59cd50cdbbf9c62.tar.bz2
aports-d545f822821e27a507d1da76c59cd50cdbbf9c62.tar.xz
community/hivex: upgrade to 1.3.20
-rw-r--r--community/hivex/APKBUILD10
-rw-r--r--community/hivex/disable-test-gnuopt-posix.patch110
2 files changed, 115 insertions, 5 deletions
diff --git a/community/hivex/APKBUILD b/community/hivex/APKBUILD
index 3113efecc6..e8f00b5e77 100644
--- a/community/hivex/APKBUILD
+++ b/community/hivex/APKBUILD
@@ -1,8 +1,8 @@
# Contributor: Francesco Colista <fcolista@alpinelinux.org>
# Maintainer: Francesco Colista <fcolista@alpinelinux.org>
pkgname=hivex
-pkgver=1.3.19
-pkgrel=2
+pkgver=1.3.20
+pkgrel=0
pkgdesc="System for extracting the contents of Windows Registry"
url="https://libguestfs.org/"
arch="all"
@@ -11,7 +11,7 @@ makedepends="libxml2-dev readline-dev perl-dev"
checkdepends="bash"
subpackages="$pkgname-dev $pkgname-doc"
source="https://libguestfs.org/download/hivex/hivex-$pkgver.tar.gz
-CVE-2021-3504.patch"
+ disable-test-gnuopt-posix.patch"
# secfixes:
# 1.3.19-r2:
@@ -40,6 +40,6 @@ package() {
}
sha512sums="
-dc271349c6efa7b55ba144617e57fe4e7ce855ec1f4ef9f84ee86eeefd3a34cb6b26078786e1568f3008b922a31b758ff2c2734e599b67e0e210aa72e9f41177 hivex-1.3.19.tar.gz
-fed79bdff539596275ef1081a2e071898b35b19494aac04d473ded3328d570d40ea6c720f0660c7ebd60625efa3f559e9f21bde600fb2eeca9354a90dffc2525 CVE-2021-3504.patch
+366e84c2a13ff53c70036df60db6e2b469cd06e3405761df73c47978b4fa0245246a1ea912aa5852b1272221d55c6c100b40b00e4c9a6f5668d12ff7f93c787a hivex-1.3.20.tar.gz
+5f84b0a33b4ebe30db597b3f1addbf53289cd75d5f636151af5e2782acc6bdc288bad51381e907d91eaa7542deb9de197dc1bbb5b6c6b9e1612bf3bbfacc9eb5 disable-test-gnuopt-posix.patch
"
diff --git a/community/hivex/disable-test-gnuopt-posix.patch b/community/hivex/disable-test-gnuopt-posix.patch
new file mode 100644
index 0000000000..73fb3389cd
--- /dev/null
+++ b/community/hivex/disable-test-gnuopt-posix.patch
@@ -0,0 +1,110 @@
+diff --git a/gnulib/tests/Makefile.am b/gnulib/tests/Makefile.am
+index e1d3c9c..f8b3797 100644
+--- a/gnulib/tests/Makefile.am
++++ b/gnulib/tests/Makefile.am
+@@ -544,15 +544,6 @@ EXTRA_libtests_a_SOURCES += getopt.c getopt1.c
+
+ ## end gnulib module getopt-posix
+
+-## begin gnulib module getopt-posix-tests
+-
+-TESTS += test-getopt-posix
+-check_PROGRAMS += test-getopt-posix
+-test_getopt_posix_LDADD = $(LDADD) $(LIBINTL)
+-EXTRA_DIST += macros.h signature.h test-getopt-posix.c test-getopt-main.h test-getopt.h
+-
+-## end gnulib module getopt-posix-tests
+-
+ ## begin gnulib module getpagesize
+
+
+diff --git a/gnulib/tests/Makefile.in b/gnulib/tests/Makefile.in
+index 19ff066..a319bb7 100644
+--- a/gnulib/tests/Makefile.in
++++ b/gnulib/tests/Makefile.in
+@@ -123,7 +123,7 @@ TESTS = test-accept$(EXEEXT) test-alloca-opt$(EXEEXT) \
+ test-fread$(EXEEXT) test-free$(EXEEXT) test-fstat$(EXEEXT) \
+ test-ftruncate.sh test-fwrite$(EXEEXT) \
+ test-getcwd-lgpl$(EXEEXT) test-getdtablesize$(EXEEXT) \
+- test-getopt-gnu$(EXEEXT) test-getopt-posix$(EXEEXT) \
++ test-getopt-gnu$(EXEEXT) \
+ test-getprogname$(EXEEXT) test-gettimeofday$(EXEEXT) \
+ test-iconv-h$(EXEEXT) test-iconv$(EXEEXT) \
+ test-ignore-value$(EXEEXT) test-inet_pton$(EXEEXT) \
+@@ -180,7 +180,7 @@ check_PROGRAMS = test-accept$(EXEEXT) test-alloca-opt$(EXEEXT) \
+ test-fread$(EXEEXT) test-free$(EXEEXT) test-fstat$(EXEEXT) \
+ test-ftruncate$(EXEEXT) test-fwrite$(EXEEXT) \
+ test-getcwd-lgpl$(EXEEXT) test-getdtablesize$(EXEEXT) \
+- test-getopt-gnu$(EXEEXT) test-getopt-posix$(EXEEXT) \
++ test-getopt-gnu$(EXEEXT) \
+ test-getprogname$(EXEEXT) test-gettimeofday$(EXEEXT) \
+ test-iconv-h$(EXEEXT) test-iconv$(EXEEXT) \
+ test-ignore-value$(EXEEXT) test-inet_pton$(EXEEXT) \
+@@ -525,10 +525,6 @@ test_getopt_gnu_SOURCES = test-getopt-gnu.c
+ test_getopt_gnu_OBJECTS = test-getopt-gnu.$(OBJEXT)
+ test_getopt_gnu_DEPENDENCIES = $(am__DEPENDENCIES_2) \
+ $(am__DEPENDENCIES_1)
+-test_getopt_posix_SOURCES = test-getopt-posix.c
+-test_getopt_posix_OBJECTS = test-getopt-posix.$(OBJEXT)
+-test_getopt_posix_DEPENDENCIES = $(am__DEPENDENCIES_2) \
+- $(am__DEPENDENCIES_1)
+ test_getprogname_SOURCES = test-getprogname.c
+ test_getprogname_OBJECTS = test-getprogname.$(OBJEXT)
+ test_getprogname_DEPENDENCIES = $(am__DEPENDENCIES_2)
+@@ -1046,7 +1042,6 @@ am__depfiles_remade = ./$(DEPDIR)/accept.Po ./$(DEPDIR)/alloca.Po \
+ ./$(DEPDIR)/test-fwrite.Po ./$(DEPDIR)/test-getcwd-lgpl.Po \
+ ./$(DEPDIR)/test-getdtablesize.Po \
+ ./$(DEPDIR)/test-getopt-gnu.Po \
+- ./$(DEPDIR)/test-getopt-posix.Po \
+ ./$(DEPDIR)/test-getprogname.Po \
+ ./$(DEPDIR)/test-gettimeofday.Po ./$(DEPDIR)/test-iconv-h.Po \
+ ./$(DEPDIR)/test-iconv.Po ./$(DEPDIR)/test-ignore-value.Po \
+@@ -3142,10 +3137,6 @@ test-getopt-gnu$(EXEEXT): $(test_getopt_gnu_OBJECTS) $(test_getopt_gnu_DEPENDENC
+ @rm -f test-getopt-gnu$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(test_getopt_gnu_OBJECTS) $(test_getopt_gnu_LDADD) $(LIBS)
+
+-test-getopt-posix$(EXEEXT): $(test_getopt_posix_OBJECTS) $(test_getopt_posix_DEPENDENCIES) $(EXTRA_test_getopt_posix_DEPENDENCIES)
+- @rm -f test-getopt-posix$(EXEEXT)
+- $(AM_V_CCLD)$(LINK) $(test_getopt_posix_OBJECTS) $(test_getopt_posix_LDADD) $(LIBS)
+-
+ test-getprogname$(EXEEXT): $(test_getprogname_OBJECTS) $(test_getprogname_DEPENDENCIES) $(EXTRA_test_getprogname_DEPENDENCIES)
+ @rm -f test-getprogname$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(test_getprogname_OBJECTS) $(test_getprogname_LDADD) $(LIBS)
+@@ -3612,7 +3603,6 @@ distclean-compile:
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-getcwd-lgpl.Po@am__quote@ # am--include-marker
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-getdtablesize.Po@am__quote@ # am--include-marker
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-getopt-gnu.Po@am__quote@ # am--include-marker
+-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-getopt-posix.Po@am__quote@ # am--include-marker
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-getprogname.Po@am__quote@ # am--include-marker
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-gettimeofday.Po@am__quote@ # am--include-marker
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-iconv-h.Po@am__quote@ # am--include-marker
+@@ -4192,13 +4182,6 @@ test-getopt-gnu.log: test-getopt-gnu$(EXEEXT)
+ --log-file $$b.log --trs-file $$b.trs \
+ $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+ "$$tst" $(AM_TESTS_FD_REDIRECT)
+-test-getopt-posix.log: test-getopt-posix$(EXEEXT)
+- @p='test-getopt-posix$(EXEEXT)'; \
+- b='test-getopt-posix'; \
+- $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+- --log-file $$b.log --trs-file $$b.trs \
+- $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+- "$$tst" $(AM_TESTS_FD_REDIRECT)
+ test-getprogname.log: test-getprogname$(EXEEXT)
+ @p='test-getprogname$(EXEEXT)'; \
+ b='test-getprogname'; \
+@@ -5064,7 +5047,6 @@ distclean: distclean-recursive
+ -rm -f ./$(DEPDIR)/test-getcwd-lgpl.Po
+ -rm -f ./$(DEPDIR)/test-getdtablesize.Po
+ -rm -f ./$(DEPDIR)/test-getopt-gnu.Po
+- -rm -f ./$(DEPDIR)/test-getopt-posix.Po
+ -rm -f ./$(DEPDIR)/test-getprogname.Po
+ -rm -f ./$(DEPDIR)/test-gettimeofday.Po
+ -rm -f ./$(DEPDIR)/test-iconv-h.Po
+@@ -5299,7 +5281,6 @@ maintainer-clean: maintainer-clean-recursive
+ -rm -f ./$(DEPDIR)/test-getcwd-lgpl.Po
+ -rm -f ./$(DEPDIR)/test-getdtablesize.Po
+ -rm -f ./$(DEPDIR)/test-getopt-gnu.Po
+- -rm -f ./$(DEPDIR)/test-getopt-posix.Po
+ -rm -f ./$(DEPDIR)/test-getprogname.Po
+ -rm -f ./$(DEPDIR)/test-gettimeofday.Po
+ -rm -f ./$(DEPDIR)/test-iconv-h.Po