diff options
Diffstat (limited to 'community/hivex')
| -rw-r--r-- | community/hivex/APKBUILD | 10 | ||||
| -rw-r--r-- | community/hivex/disable-test-gnuopt-posix.patch | 110 |
2 files changed, 4 insertions, 116 deletions
diff --git a/community/hivex/APKBUILD b/community/hivex/APKBUILD index e8f00b5e770..3126f4f0f99 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.20 -pkgrel=0 +pkgver=1.3.23 +pkgrel=3 pkgdesc="System for extracting the contents of Windows Registry" url="https://libguestfs.org/" arch="all" @@ -10,8 +10,7 @@ license="LGPL-2.1" makedepends="libxml2-dev readline-dev perl-dev" checkdepends="bash" subpackages="$pkgname-dev $pkgname-doc" -source="https://libguestfs.org/download/hivex/hivex-$pkgver.tar.gz - disable-test-gnuopt-posix.patch" +source="https://libguestfs.org/download/hivex/hivex-$pkgver.tar.gz" # secfixes: # 1.3.19-r2: @@ -40,6 +39,5 @@ package() { } sha512sums=" -366e84c2a13ff53c70036df60db6e2b469cd06e3405761df73c47978b4fa0245246a1ea912aa5852b1272221d55c6c100b40b00e4c9a6f5668d12ff7f93c787a hivex-1.3.20.tar.gz -5f84b0a33b4ebe30db597b3f1addbf53289cd75d5f636151af5e2782acc6bdc288bad51381e907d91eaa7542deb9de197dc1bbb5b6c6b9e1612bf3bbfacc9eb5 disable-test-gnuopt-posix.patch +068fe81a442c8045bf9d98f0c6b782330141d8f1e104a0f191c04a2cff25ee6396c2c4777c107d595a471eb4bcbee903400c9f7946cae036165ac201587f861e hivex-1.3.23.tar.gz " diff --git a/community/hivex/disable-test-gnuopt-posix.patch b/community/hivex/disable-test-gnuopt-posix.patch deleted file mode 100644 index 73fb3389cda..00000000000 --- a/community/hivex/disable-test-gnuopt-posix.patch +++ /dev/null @@ -1,110 +0,0 @@ -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 |