control: tags -1 patch pending Dear maintainer,
I've prepared an NMU for libprelude (versioned as 5.2.0-5.2) and uploaded it. diff attached G.
diff -Nru libprelude-5.2.0/debian/changelog libprelude-5.2.0/debian/changelog
--- libprelude-5.2.0/debian/changelog 2023-12-04 11:34:12.000000000 +0100
+++ libprelude-5.2.0/debian/changelog 2023-12-04 19:30:14.000000000 +0100
@@ -1,3 +1,20 @@
+libprelude (5.2.0-5.2) unstable; urgency=medium
+
+ [ Gianfranco Costamagna ]
+ * Non-maintainer upload.
+ * Mark 3 symbols as optional, disappearing with -O3 on ppc64el
+ (Closes: #1056401)
+ * Also move from libltdl3-dev to libltdl-dev in libprelude-dev
+ package (Closes: #1008698)
+
+ [ Helmut Grohne ]
+ * Fix FTCBFS: (Closes: #1022963)
+ + Use declarative ruby addon.
+ + export cross variables for perl, python and ruby
+ + cross.patch: Fix bare and useless pkg-config invocation.
+
+ -- Gianfranco Costamagna <locutusofb...@debian.org> Mon, 04 Dec 2023
19:30:14 +0100
+
libprelude (5.2.0-5.1) unstable; urgency=medium
* Non-maintainer upload.
diff -Nru libprelude-5.2.0/debian/control libprelude-5.2.0/debian/control
--- libprelude-5.2.0/debian/control 2021-08-29 10:39:10.000000000 +0200
+++ libprelude-5.2.0/debian/control 2023-12-04 19:30:14.000000000 +0100
@@ -6,8 +6,8 @@
Rules-Requires-Root: no
Build-Depends: debhelper-compat (= 13),
dh-sequence-python3 <!nopython>,
+ dh-sequence-ruby <!noruby>,
gawk,
- gem2deb <!noruby>,
libgcrypt20-dev,
libgnutls28-dev,
libltdl-dev,
@@ -30,7 +30,7 @@
Architecture: any
Suggests: libprelude-doc
Depends: libprelude28 (= ${binary:Version}), libpreludecpp12 (=
${binary:Version}), libgnutls28-dev,
- libgcrypt20-dev, libltdl3-dev, ${misc:Depends}
+ libgcrypt20-dev, libltdl-dev, ${misc:Depends}
Description: Security Information and Events Management system [ Development
files ]
The Prelude Library is a collection of generic functions providing
communication between the Prelude SIEM suite components. It provides a
diff -Nru libprelude-5.2.0/debian/libpreludecpp12.symbols
libprelude-5.2.0/debian/libpreludecpp12.symbols
--- libprelude-5.2.0/debian/libpreludecpp12.symbols 2021-11-03
19:53:39.000000000 +0100
+++ libprelude-5.2.0/debian/libpreludecpp12.symbols 2023-12-04
19:30:12.000000000 +0100
@@ -366,9 +366,9 @@
(optional)_ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEE12_M_constructIPKcEEvT_S8_St20forward_iterator_tag@Base
4.1
(optional)_ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEC1IS3_EEPKcRKS3_@Base
5.2.0
(optional)_ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEC2IS3_EEPKcRKS3_@Base
5.2.0
- _ZNSt7__cxx1115basic_stringbufIcSt11char_traitsIcESaIcEED0Ev@Base 5.0.0
- _ZNSt7__cxx1115basic_stringbufIcSt11char_traitsIcESaIcEED1Ev@Base 5.0.0
- _ZNSt7__cxx1115basic_stringbufIcSt11char_traitsIcESaIcEED2Ev@Base 5.0.0
+ (optional)_ZNSt7__cxx1115basic_stringbufIcSt11char_traitsIcESaIcEED0Ev@Base
5.0.0
+ (optional)_ZNSt7__cxx1115basic_stringbufIcSt11char_traitsIcESaIcEED1Ev@Base
5.0.0
+ (optional)_ZNSt7__cxx1115basic_stringbufIcSt11char_traitsIcESaIcEED2Ev@Base
5.0.0
(optional)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_S5_ESt10_Select1stIS8_ESt4lessIS5_ESaIS8_EE22_M_emplace_hint_uniqueIJRKSt21piecewise_construct_tSt5tupleIJOS5_EESJ_IJEEEEESt17_Rb_tree_iteratorIS8_ESt23_Rb_tree_const_iteratorIS8_EDpOT_@Base
5.0.0
(optional)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_S5_ESt10_Select1stIS8_ESt4lessIS5_ESaIS8_EE24_M_get_insert_unique_posERS7_@Base
5.0.0
(optional)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_S5_ESt10_Select1stIS8_ESt4lessIS5_ESaIS8_EE29_M_get_insert_hint_unique_posESt23_Rb_tree_const_iteratorIS8_ERS7_@Base
5.0.0
diff -Nru libprelude-5.2.0/debian/patches/cross.patch
libprelude-5.2.0/debian/patches/cross.patch
--- libprelude-5.2.0/debian/patches/cross.patch 1970-01-01 01:00:00.000000000
+0100
+++ libprelude-5.2.0/debian/patches/cross.patch 2023-12-04 19:30:14.000000000
+0100
@@ -0,0 +1,11 @@
+--- libprelude-5.2.0.orig/m4/am_path_ruby.m4
++++ libprelude-5.2.0/m4/am_path_ruby.m4
+@@ -100,7 +100,7 @@
+
+ dnl if PKG-CONFIG is available, we use it. Else, we try to dectect
RUBY_INCLUDES manually
+ RUBY_VER=`$RUBY -rrbconfig -e "print RbConfig::CONFIG[['ruby_pc']]" | sed
's/.pc//g'`
+- PKG_CHECK_MODULES(RUBY_PKG_CONFIG, $RUBY_VER, [RUBY_INCLUDES=`pkg-config
$RUBY_VER --cflags`], [RUBY_INCLUDES=`$RUBY -r rbconfig -e '
++ PKG_CHECK_MODULES(RUBY_PKG_CONFIG, $RUBY_VER,
[RUBY_INCLUDES=$RUBY_PKG_CONFIG_CFLAGS], [RUBY_INCLUDES=`$RUBY -r rbconfig -e '
+ if RbConfig::CONFIG[["archdir"]] then print " -I" +
RbConfig::CONFIG[["archdir"]] end
+ if RbConfig::CONFIG[["rubyhdrdir"]] then print " -I" +
RbConfig::CONFIG[["rubyhdrdir"]] end
+ if RbConfig::CONFIG[["rubyhdrdir"]] and
RbConfig::CONFIG[["sitearch"]] then print " -I" +
RbConfig::CONFIG[["rubyhdrdir"]] + "/" + RbConfig::CONFIG[["sitearch"]] end'`] )
diff -Nru libprelude-5.2.0/debian/patches/series
libprelude-5.2.0/debian/patches/series
--- libprelude-5.2.0/debian/patches/series 2021-08-29 10:39:10.000000000
+0200
+++ libprelude-5.2.0/debian/patches/series 2023-12-04 19:30:14.000000000
+0100
@@ -12,3 +12,4 @@
023-Disable_GnuLib_Tests_perror2_strerror.patch
024-Fix_Config_H.patch
025-Fix-PyIOBase_Type.patch
+cross.patch
diff -Nru libprelude-5.2.0/debian/rules libprelude-5.2.0/debian/rules
--- libprelude-5.2.0/debian/rules 2023-12-04 11:34:12.000000000 +0100
+++ libprelude-5.2.0/debian/rules 2023-12-04 19:30:14.000000000 +0100
@@ -1,5 +1,7 @@
#! /usr/bin/make -f
+include /usr/share/dpkg/architecture.mk
+
export DEB_BUILD_MAINT_OPTIONS = hardening=+all
CONFIGURE_FLAGS = --without-python2 --enable-easy-bindings
@@ -16,9 +18,7 @@
CONFIGURE_FLAGS += --with-perl=no
endif
-ifeq ($(filter noruby,$(DEB_BUILD_PROFILES)),)
- DH_ADDONS += --with ruby
-else
+ifneq ($(filter noruby,$(DEB_BUILD_PROFILES)),)
CONFIGURE_FLAGS += --with-ruby=no
endif
@@ -30,6 +30,14 @@
CONFIGURE_FLAGS += --enable-gtk-doc
endif
+ifneq ($(DEB_BUILD_ARCH),$(DEB_HOST_ARCH))
+ export _PYTHON_SYSCONFIGDATA_NAME=_sysconfigdata__$(DEB_HOST_MULTIARCH)
+ PERLVER=$(shell perl -MConfig -e 'print $$Config{version}')
+ export
PERLLIB=/usr/lib/$(DEB_HOST_MULTIARCH)/perl/cross-config-$(PERLVER)
+ RUBYVER=$(shell ruby -e "puts RbConfig::CONFIG['ruby_version']")
+ export RUBYLIB=/usr/lib/$(DEB_HOST_MULTIARCH)/ruby-crossbuild/$(RUBYVER)
+endif
+
override_dh_auto_configure:
dh_auto_configure -- $(CONFIGURE_FLAGS)
@@ -56,4 +64,4 @@
cd bindings/python && python$* setup.py install --root
$(CURDIR)/debian/tmp --install-layout=deb
%:
- dh $@ $(DH_ADDONS)
+ dh $@
diff -Nru libprelude-5.2.0/debian/rules.orig libprelude-5.2.0/debian/rules.orig
--- libprelude-5.2.0/debian/rules.orig 1970-01-01 01:00:00.000000000 +0100
+++ libprelude-5.2.0/debian/rules.orig 2023-12-04 11:34:12.000000000 +0100
@@ -0,0 +1,59 @@
+#! /usr/bin/make -f
+
+export DEB_BUILD_MAINT_OPTIONS = hardening=+all
+CONFIGURE_FLAGS = --without-python2 --enable-easy-bindings
+
+ifeq ($(filter nopython,$(DEB_BUILD_PROFILES)),)
+ CONFIGURE_FLAGS += --with-python3=yes
+ PY3VERS=$(shell py3versions -vr)
+else
+ CONFIGURE_FLAGS += --with-python3=no
+endif
+
+ifeq ($(filter noperl,$(DEB_BUILD_PROFILES)),)
+ CONFIGURE_FLAGS += --with-perl-installdirs=vendor
+else
+ CONFIGURE_FLAGS += --with-perl=no
+endif
+
+ifeq ($(filter noruby,$(DEB_BUILD_PROFILES)),)
+ DH_ADDONS += --with ruby
+else
+ CONFIGURE_FLAGS += --with-ruby=no
+endif
+
+ifneq ($(filter nolua,$(DEB_BUILD_PROFILES)),)
+ CONFIGURE_FLAGS += --with-lua=no
+endif
+
+ifneq ($(filter libprelude-doc,$(shell dh_listpackages)),)
+ CONFIGURE_FLAGS += --enable-gtk-doc
+endif
+
+override_dh_auto_configure:
+ dh_auto_configure -- $(CONFIGURE_FLAGS)
+
+override_dh_auto_build: build-core $(PY3VERS:%=build-python%)
+
+build-core:
+ dh_auto_build
+
+build-python%:
+ cd bindings/python && python$* setup.py build
+
+override_dh_autoreconf-arch:
+ env GTKDOCIZE="echo DISABLED running gtkdocize" dh_autoreconf --verbose
-a
+
+override_dh_auto_install: install-core $(PY3VERS:%=install-python%)
+install-core:
+ dh_auto_install -- DEB_PYTHON_INSTALL_LAYOUT=deb
+ find . -name "__pycache__" -exec rm -rvf {} +
+ find . -name "*.la" -exec sed -i -e
's/^dependency_libs=.*$$/dependency_libs=/g' {} +
+ mkdir -pv $(CURDIR)/debian/tmp/usr/share/doc/libprelude-doc
+ ln -s /usr/share/gtk-doc/html/libprelude
$(CURDIR)/debian/tmp/usr/share/doc/libprelude-doc/html
+
+install-python%:
+ cd bindings/python && python$* setup.py install --root
$(CURDIR)/debian/tmp --install-layout=deb
+
+%:
+ dh $@ $(DH_ADDONS)
OpenPGP_signature.asc
Description: OpenPGP digital signature
