Hi all, I plan to fix RC bugs #965505, #998956 by NMU this package. The debdiff is as attachment.
My plan is I'll wait for 10 days to see if anyone complains in the bug report.
And then I'll upload to delay/10 queue.
The following changes are made:
* Non-maintainer upload.
* Bump debhelper version to 12. (Closes: #965505)
- Update debian/rules to use dh. (Closes: #998956)
- Remove Build-Depends on autotools-dev
* Add debian/patches/0002-fix-format-security.patch
- Newer debhelper force format-security. Thus we need a patch.
* Add debian/patches/0003-correct-gettext-version.patch
- Update gettext version.
* Remove unnecessarily Build-Depends on deprecated libdbus-glib-1-dev
(Closes: #955830)
Yours,
Paul
diff -Nru efax-gtk-3.2.8/debian/changelog efax-gtk-3.2.8/debian/changelog --- efax-gtk-3.2.8/debian/changelog 2021-02-06 22:21:12.000000000 +0800 +++ efax-gtk-3.2.8/debian/changelog 2022-12-09 23:39:09.000000000 +0800 @@ -1,3 +1,18 @@ +efax-gtk (3.2.8-2.3) unstable; urgency=low + + * Non-maintainer upload. + * Bump debhelper version to 12. (Closes: #965505) + - Update debian/rules to use dh. (Closes: #998956) + - Remove Build-Depends on autotools-dev + * Add debian/patches/0002-fix-format-security.patch + - Newer debhelper force format-security. Thus we need a patch. + * Add debian/patches/0003-correct-gettext-version.patch + - Update gettext version. + * Remove unnecessarily Build-Depends on deprecated libdbus-glib-1-dev + (Closes: #955830) + + -- Ying-Chun Liu (PaulLiu) <paul...@debian.org> Fri, 09 Dec 2022 23:39:09 +0800 + efax-gtk (3.2.8-2.2) unstable; urgency=medium * Non-maintainer upload. diff -Nru efax-gtk-3.2.8/debian/clean efax-gtk-3.2.8/debian/clean --- efax-gtk-3.2.8/debian/clean 1970-01-01 08:00:00.000000000 +0800 +++ efax-gtk-3.2.8/debian/clean 2022-12-09 23:39:09.000000000 +0800 @@ -0,0 +1,2 @@ +efax/efax-0.9a.1 +efax/efix-0.9a.1 diff -Nru efax-gtk-3.2.8/debian/compat efax-gtk-3.2.8/debian/compat --- efax-gtk-3.2.8/debian/compat 2010-11-14 02:00:15.000000000 +0800 +++ efax-gtk-3.2.8/debian/compat 1970-01-01 08:00:00.000000000 +0800 @@ -1 +0,0 @@ -5 diff -Nru efax-gtk-3.2.8/debian/control efax-gtk-3.2.8/debian/control --- efax-gtk-3.2.8/debian/control 2017-03-22 19:43:43.000000000 +0800 +++ efax-gtk-3.2.8/debian/control 2022-12-09 23:39:09.000000000 +0800 @@ -2,7 +2,7 @@ Section: comm Priority: optional Maintainer: Lior Kaplan <kap...@debian.org> -Build-Depends: debhelper (>= 5.0.0), autotools-dev, pkg-config, libgtk2.0-dev, libdbus-glib-1-dev, libtiff5-dev, gettext +Build-Depends: debhelper-compat (= 12), pkg-config, libgtk2.0-dev, libtiff5-dev, gettext Standards-Version: 3.9.1 Vcs-Git: git://git.code.sf.net/p/efax-gtk/git Vcs-Browser: http://sourceforge.net/p/efax-gtk/git/ci/master diff -Nru efax-gtk-3.2.8/debian/patches/0002-fix-format-security.patch efax-gtk-3.2.8/debian/patches/0002-fix-format-security.patch --- efax-gtk-3.2.8/debian/patches/0002-fix-format-security.patch 1970-01-01 08:00:00.000000000 +0800 +++ efax-gtk-3.2.8/debian/patches/0002-fix-format-security.patch 2022-12-09 23:39:09.000000000 +0800 @@ -0,0 +1,43 @@ +Description: fix for hardening + When bumping debhelper compat, hardening is enabled. So + we need to fix all the format-security errors. +Author: Ying-Chun Liu (PaulLiu) <paul...@debian.org> +Last-Update: 2022-12-10 +Index: efax-gtk-3.2.8/src/dialogs.cpp +=================================================================== +--- efax-gtk-3.2.8.orig/src/dialogs.cpp ++++ efax-gtk-3.2.8/src/dialogs.cpp +@@ -398,7 +398,7 @@ InfoDialog::InfoDialog(const char* text, + WinBase(caption, prog_config.window_icon_h, + modal, parent_p, + GTK_WINDOW(gtk_message_dialog_new(0, GtkDialogFlags(0), +- message_type, GTK_BUTTONS_CLOSE, text))) { ++ message_type, GTK_BUTTONS_CLOSE, "%s", text))) { + + // make further specialisations for a message dialog object + +Index: efax-gtk-3.2.8/efax/efaxlib.c +=================================================================== +--- efax-gtk-3.2.8.orig/efax/efaxlib.c ++++ efax-gtk-3.2.8/efax/efaxlib.c +@@ -1943,7 +1943,7 @@ int nextopage ( OFILE *f, int page ) + tiffinit(f) ; /* rewind & update TIFF header */ + break ; + case O_PCL: +- fprintf ( f->f, PCLEND ) ; ++ fprintf ( f->f, "%s", PCLEND ) ; + break ; + case O_PS: + fprintf ( f->f, PSPAGEEND ) ; +Index: efax-gtk-3.2.8/efax-gtk-faxfilter/efax-gtk-socket-client.cpp +=================================================================== +--- efax-gtk-3.2.8.orig/efax-gtk-faxfilter/efax-gtk-socket-client.cpp ++++ efax-gtk-3.2.8/efax-gtk-faxfilter/efax-gtk-socket-client.cpp +@@ -87,6 +87,6 @@ int main(int argc, char* argv[]) { + void error_msg(const char* message) { + + std::cerr << "efax-gtk-socket-client: " << message << std::flush; +- syslog(LOG_ERR | LOG_USER, message); ++ syslog(LOG_ERR | LOG_USER, "%s", message); + + } diff -Nru efax-gtk-3.2.8/debian/patches/0003-correct-gettext-version.patch efax-gtk-3.2.8/debian/patches/0003-correct-gettext-version.patch --- efax-gtk-3.2.8/debian/patches/0003-correct-gettext-version.patch 1970-01-01 08:00:00.000000000 +0800 +++ efax-gtk-3.2.8/debian/patches/0003-correct-gettext-version.patch 2022-12-09 23:39:09.000000000 +0800 @@ -0,0 +1,16 @@ +Description: update gettext version +Author: Ying-Chun Liu (PaulLiu) <paul...@debian.org> +Last-Update: 2022-12-10 +Index: efax-gtk-3.2.8/po/Makefile.in.in +=================================================================== +--- efax-gtk-3.2.8.orig/po/Makefile.in.in ++++ efax-gtk-3.2.8/po/Makefile.in.in +@@ -9,7 +9,7 @@ + # General Public License and is *not* in the public domain. + # + # Origin: gettext-0.17 +-GETTEXT_MACRO_VERSION = 0.17 ++GETTEXT_MACRO_VERSION = 0.20 + + PACKAGE = @PACKAGE@ + VERSION = @VERSION@ diff -Nru efax-gtk-3.2.8/debian/patches/efax-manpages efax-gtk-3.2.8/debian/patches/efax-manpages --- efax-gtk-3.2.8/debian/patches/efax-manpages 2011-04-05 03:02:28.000000000 +0800 +++ efax-gtk-3.2.8/debian/patches/efax-manpages 2022-12-09 23:39:09.000000000 +0800 @@ -1,13 +1,13 @@ -Description: Change manpages names according to the binary files. -Author: Lior Kaplan <kap...@debian.org> ---- a/efax/Makefile.in -+++ b/efax/Makefile.in -@@ -242,7 +242,7 @@ - efax_0_9a_SOURCES = efax.c efaxlib.c efaxio.c efaxos.c efaxmsg.c - efix_0_9a_SOURCES = efix.c efaxlib.c efaxmsg.c +Index: efax-gtk-3.2.8/efax/Makefile.am +=================================================================== +--- efax-gtk-3.2.8.orig/efax/Makefile.am ++++ efax-gtk-3.2.8/efax/Makefile.am +@@ -8,7 +8,7 @@ efix_0_9a_SOURCES = efix.c efaxlib.c efa + noinst_HEADERS = efaxlib.h efaxio.h efaxos.h efaxmsg.h + -dist_man_MANS = efax.1 efix.1 +dist_man_MANS = efax-0.9a.1 efix-0.9a.1 + INCLUDES = -DDATADIR=\"$(datadir)\" - AM_CFLAGS = @GLIB_CFLAGS@ - efax_0_9a_LDADD = @GLIB_LIBS@ + diff -Nru efax-gtk-3.2.8/debian/patches/series efax-gtk-3.2.8/debian/patches/series --- efax-gtk-3.2.8/debian/patches/series 2021-02-06 22:21:11.000000000 +0800 +++ efax-gtk-3.2.8/debian/patches/series 2022-12-09 23:39:09.000000000 +0800 @@ -1,3 +1,5 @@ desktop efax-manpages 0001-Fix-build-for-gcc-10.patch +0002-fix-format-security.patch +0003-correct-gettext-version.patch diff -Nru efax-gtk-3.2.8/debian/rules efax-gtk-3.2.8/debian/rules --- efax-gtk-3.2.8/debian/rules 2017-03-22 19:43:39.000000000 +0800 +++ efax-gtk-3.2.8/debian/rules 2022-12-09 23:39:09.000000000 +0800 @@ -16,90 +16,19 @@ DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) -CFLAGS = -Wall -g - -ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) - CFLAGS += -O0 -else - CFLAGS += -O2 -endif - ifneq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS))) STRIP += --enable-debug endif -config.status: configure - #Read "The problem with time-stamp skews and Debian source packages:" - #in /usr/share/doc/autotools-dev/README.Debian.gz - -# touch configure.in && \ -# touch aclocal.m4 && \ -# touch configure - - dh_testdir - dh_autotools-dev_updateconfig - # Add here commands to configure the package. - CFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info --sysconfdir=/etc --with-spooldir=\$${prefix}/bin ${STRIP} +%: + dh $@ +override_dh_auto_configure: + dh_auto_configure -- --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info --sysconfdir=/etc --with-spooldir=\$${prefix}/bin ${STRIP} -build: build-stamp - -build-stamp: config.status - dh_testdir +override_dh_auto_build: # Add here commands to compile the package. cp -p efax/efax.1 efax/efax-0.9a.1 cp -p efax/efix.1 efax/efix-0.9a.1 - $(MAKE) - - touch build-stamp - -clean: - dh_testdir - dh_testroot - rm -f build-stamp - - # Add here commands to clean up after the build process. - [ ! -f Makefile ] || $(MAKE) distclean - rm -f efax/efax-0.9a.1 - rm -f efax/efix-0.9a.1 - - dh_autotools-dev_restoreconfig - dh_clean --exclude ./efax/Makefile.orig --exclude ./efax/efax.c.orig --exclude ./efax/efix.c.orig --exclude ./efax/efaxlib.c.orig --exclude ./efax/efaxmsg.c.orig --exclude ./efax/efaxio.c.orig --exclude ./efax/efaxos.c.orig - -install: build - dh_testdir - dh_testroot - dh_clean -k config.log --exclude ./efax/Makefile.orig --exclude ./efax/efax.c.orig --exclude ./efax/efix.c.orig --exclude ./efax/efaxlib.c.orig --exclude ./efax/efaxmsg.c.orig --exclude ./efax/efaxio.c.orig --exclude ./efax/efaxos.c.orig - dh_installdirs - - # Add here commands to install the package into debian/efax-gtk. - $(MAKE) install DESTDIR=$(CURDIR)/debian/efax-gtk - - -# Build architecture-independent files here. -binary-indep: build install -# We have nothing to do by default. - -# Build architecture-dependent files here. -binary-arch: build install - dh_testdir - dh_testroot - dh_install - dh_installchangelogs ChangeLog - dh_installdocs - dh_installexamples - dh_installmenu - dh_installman - dh_link - dh_strip - dh_compress - dh_fixperms - dh_installdeb - dh_shlibdeps - dh_gencontrol - dh_md5sums - dh_builddeb - -binary: binary-indep binary-arch -.PHONY: build clean binary-indep binary-arch binary install + dh_auto_build
OpenPGP_0x44173FA13D058888.asc
Description: OpenPGP public key
OpenPGP_signature
Description: OpenPGP digital signature
