Control: tags -1 + patch
I'm not super happy with the attached patch, but it makes libcap2 build.
Please consider improving it. :)
Helmut
diff --minimal -Nru libcap2-2.25/debian/changelog libcap2-2.25/debian/changelog
--- libcap2-2.25/debian/changelog 2016-05-01 10:23:13.000000000 +0200
+++ libcap2-2.25/debian/changelog 2017-07-24 17:49:34.000000000 +0200
@@ -1,3 +1,10 @@
+libcap2 (1:2.25-1.1) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ * Fix FTBFS with gperf 3.1. (Closes: #869588)
+
+ -- Helmut Grohne <hel...@subdivi.de> Mon, 24 Jul 2017 17:49:34 +0200
+
libcap2 (1:2.25-1) unstable; urgency=medium
* New upstream release. LP: #1451601
diff --minimal -Nru libcap2-2.25/debian/control libcap2-2.25/debian/control
--- libcap2-2.25/debian/control 2016-05-01 10:23:13.000000000 +0200
+++ libcap2-2.25/debian/control 2017-07-24 17:49:04.000000000 +0200
@@ -6,7 +6,7 @@
debhelper (>= 9),
indent,
libpam0g-dev,
- gperf,
+ gperf (>= 3.1),
Standards-Version: 3.9.8
Homepage: http://sites.google.com/site/fullycapable/
Vcs-Git: https://anonscm.debian.org/git/collab-maint/libcap2.git
diff --minimal -Nru libcap2-2.25/debian/patches/Hide-private-symbols.patch
libcap2-2.25/debian/patches/Hide-private-symbols.patch
--- libcap2-2.25/debian/patches/Hide-private-symbols.patch 2016-05-01
10:23:13.000000000 +0200
+++ libcap2-2.25/debian/patches/Hide-private-symbols.patch 2017-07-24
17:49:34.000000000 +0200
@@ -5,10 +5,14 @@
Hide a symbol which is clearly meant to be private. This resolves a FTBFS in
combination with the new build dependency gperf.
+Also update the signature of __cap_lookup_name for gperf 3.1.
+
Closes: #793311
+Closes: #869588
Bug-Debian: https://bugs.debian.org/793311
-Last-Update: 2015-10-02
+Bug-Debian: https://bugs.debian.org/869588
+Last-Update: 2017-07-24
---
libcap/Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
@@ -22,7 +26,7 @@
$(GPERF_OUTPUT): cap_names.list.h
- perl -e 'print "struct __cap_token_s { const char *name; int index;
};\n%{\nconst struct __cap_token_s *__cap_lookup_name(const char *, unsigned
int);\n%}\n%%\n"; while ($$l = <>) { $$l =~ s/[\{\"]//g; $$l =~ s/\}.*// ;
print $$l; }' < $< | gperf --ignore-case --language=ANSI-C --readonly
--null-strings --global-table --hash-function-name=__cap_hash_name
--lookup-function-name="__cap_lookup_name" -c -t -m20 $(INDENT) > $@
-+ perl -e 'print "struct __cap_token_s { const char *name; int index;
};\n%{\nstatic const struct __cap_token_s *__cap_lookup_name(const char *,
unsigned int);\n%}\n%%\n"; while ($$l = <>) { $$l =~ s/[\{\"]//g; $$l =~
s/\}.*// ; print $$l; }' < $< | gperf --ignore-case --language=ANSI-C
--readonly --null-strings --global-table --hash-function-name=__cap_hash_name
--lookup-function-name="__cap_lookup_name" -c -t -m20 $(INDENT) > $@
++ perl -e 'print "struct __cap_token_s { const char *name; int index;
};\n%{\n#include <stdlib.h>\nstatic const struct __cap_token_s
*__cap_lookup_name(const char *, size_t);\n%}\n%%\n"; while ($$l = <>) { $$l =~
s/[\{\"]//g; $$l =~ s/\}.*// ; print $$l; }' < $< | gperf --includes
--ignore-case --language=ANSI-C --readonly --null-strings --global-table
--hash-function-name=__cap_hash_name --lookup-function-name="__cap_lookup_name"
-c -t -m20 $(INDENT) > $@
cap_names.list.h: Makefile $(KERNEL_HEADERS)/linux/capability.h
@echo "=> making $@ from $(KERNEL_HEADERS)/linux/capability.h"
