Package: sponsorship-requests Severity: normal Tags: patch
Dear mentors I am looking for a sponsor for my patch to package "mtink": * Package name : mtink Version : 1.0.16-8 Upstream Author : Jean-Jacques Sarton <jj.sar...@t-online.de> * URL : http://xwtools.automatix.de/ * License : GPL-2 Section : misc It builds the following binary packages: mtink - Status monitor tool for Epson inkjet printers mtink-doc - Documentation for mtink The patch is attached to this bug report. Changes since the last upload: * QA upload. * Really build with hardening flags. * Override remaining Lintian spelling error warnings. * Add keywords entries to d/*.desktop. Regards Graham
diff -Nru mtink-1.0.16/debian/changelog mtink-1.0.16/debian/changelog --- mtink-1.0.16/debian/changelog 2013-09-06 20:54:56.000000000 +0200 +++ mtink-1.0.16/debian/changelog 2013-11-12 11:50:49.000000000 +0200 @@ -1,3 +1,12 @@ +mtink (1.0.16-8) UNRELEASED; urgency=low + + * QA upload. + * Really build with hardening flags. + * Override remaining Lintian spelling error warnings. + * Add keywords entries to d/*.desktop. + + -- Graham Inggs <gra...@nerve.org.za> Tue, 12 Nov 2013 11:43:58 +0200 + mtink (1.0.16-7) unstable; urgency=low * QA upload. diff -Nru mtink-1.0.16/debian/mtinkc.desktop mtink-1.0.16/debian/mtinkc.desktop --- mtink-1.0.16/debian/mtinkc.desktop 2012-02-07 01:35:07.000000000 +0200 +++ mtink-1.0.16/debian/mtinkc.desktop 2013-11-11 16:48:33.000000000 +0200 @@ -9,3 +9,4 @@ TryExec=mtinkc Exec=mtinkc Categories=Motif;Utility;HardwareSettings;Monitor; +Keywords=Epson;inkjet;ink;status;monitor;printer; diff -Nru mtink-1.0.16/debian/mtink.desktop mtink-1.0.16/debian/mtink.desktop --- mtink-1.0.16/debian/mtink.desktop 2012-02-07 01:34:59.000000000 +0200 +++ mtink-1.0.16/debian/mtink.desktop 2013-11-11 16:48:22.000000000 +0200 @@ -9,3 +9,4 @@ TryExec=mtink Exec=mtink Categories=Motif;Utility;HardwareSettings;Monitor; +Keywords=Epson;inkjet;ink;status;monitor;printer; diff -Nru mtink-1.0.16/debian/mtink.lintian-overrides mtink-1.0.16/debian/mtink.lintian-overrides --- mtink-1.0.16/debian/mtink.lintian-overrides 1970-01-01 02:00:00.000000000 +0200 +++ mtink-1.0.16/debian/mtink.lintian-overrides 2013-11-11 17:12:56.000000000 +0200 @@ -0,0 +1,3 @@ +mtink: spelling-error-in-binary usr/bin/mtink proces process +mtink: spelling-error-in-binary usr/bin/mtink Ment Meant +mtink: spelling-error-in-binary usr/bin/ttink ment meant diff -Nru mtink-1.0.16/debian/patches/harden-askprinter mtink-1.0.16/debian/patches/harden-askprinter --- mtink-1.0.16/debian/patches/harden-askprinter 2013-09-06 20:40:12.000000000 +0200 +++ mtink-1.0.16/debian/patches/harden-askprinter 1970-01-01 02:00:00.000000000 +0200 @@ -1,15 +0,0 @@ -Description: compile detect/askPrinter.c with hardening flags -Author: Graham Inggs <gra...@nerve.org.za> -Forwarded: No -Last-Update: 2013-07-31 ---- a/Makefile.ORG -+++ b/Makefile.ORG -@@ -269,7 +269,7 @@ - - $(DETDIR)/askPrinter: $(DETDIR)/askPrinter.c - @echo Compile and link askPrinter.c -- @$(CC) -o $(DETDIR)/askPrinter $(DETDIR)/askPrinter.c -I. -I$(DETDIR) -+ @$(CC) -o $(DETDIR)/askPrinter $(DETDIR)/askPrinter.c $(CFLAGS) $(LDFLAGS) -I. -I$(DETDIR) - - ########### utilities ###################### - diff -Nru mtink-1.0.16/debian/patches/pass-hardening-flags mtink-1.0.16/debian/patches/pass-hardening-flags --- mtink-1.0.16/debian/patches/pass-hardening-flags 1970-01-01 02:00:00.000000000 +0200 +++ mtink-1.0.16/debian/patches/pass-hardening-flags 2013-11-11 17:21:07.000000000 +0200 @@ -0,0 +1,39 @@ +Description: pass hardening flags as required +Author: Graham Inggs <gra...@nerve.org.za> +Forwarded: No +Last-Update: 2013-11-11 +--- a/Makefile.ORG ++++ b/Makefile.ORG +@@ -235,12 +235,12 @@ + + ttink: $(TTYOBJ) $(SRCDIR)/d4lib.h $(SRCDIR)/cmd.h $(SRCDIR)/mtink.h $(SRCDIR)/model.h $(SRCDIR)/version.h Makefile + @echo Link ttink +- @$(CC) -o ttink $(TTYOBJ) $(CFLAGS) $(MTINK_CFLAGS) $(RDTIMEOUT) $(DEVICE) $(WRTIMEOUT) $(DEBUG) $(KERNEL_USB_BUG) $(MACOSLDFLG) -DWITH_X=0 ++ @$(CC) -o ttink $(TTYOBJ) $(CFLAGS) $(MTINK_CFLAGS) $(LDFLAGS) $(RDTIMEOUT) $(DEVICE) $(WRTIMEOUT) $(DEBUG) $(KERNEL_USB_BUG) $(MACOSLDFLG) -DWITH_X=0 + + ############# PLUG-IN ####################### + gimp-mtink: $(SRCDIR)/gimp-mtink.c Makefile + @echo Compile and link gimp-mtink.c +- @-$(CC) -o gimp-mtink $(SRCDIR)/gimp-mtink.c $(GIMP_INC) $(GIMP_LIB) ++ @-$(CC) -o gimp-mtink $(SRCDIR)/gimp-mtink.c $(CFLAGS) $(LDFLAGS) $(GIMP_INC) $(GIMP_LIB) + + ############# SERVER ######################## + $(SVRDIR)/mtinkd.o: $(SVRDIR)/mtinkd.c Makefile +@@ -257,7 +257,7 @@ + + mtinkd: $(SVR_OBJ) Makefile + @echo Link mtinkd +- @$(CC) -o mtinkd $(SVR_OBJ) $(CFLAGS) $(MTINK_CFLAGS) $(MACOSLDFLG) ++ @$(CC) -o mtinkd $(SVR_OBJ) $(CFLAGS) $(MTINK_CFLAGS) $(LDFLAGS) $(MACOSLDFLG) + + ########### Chooser ############## + +@@ -269,7 +269,7 @@ + + $(DETDIR)/askPrinter: $(DETDIR)/askPrinter.c + @echo Compile and link askPrinter.c +- @$(CC) -o $(DETDIR)/askPrinter $(DETDIR)/askPrinter.c -I. -I$(DETDIR) ++ @$(CC) -o $(DETDIR)/askPrinter $(DETDIR)/askPrinter.c $(CFLAGS) $(LDFLAGS) -I. -I$(DETDIR) + + ########### utilities ###################### + diff -Nru mtink-1.0.16/debian/patches/series mtink-1.0.16/debian/patches/series --- mtink-1.0.16/debian/patches/series 2013-09-06 20:40:12.000000000 +0200 +++ mtink-1.0.16/debian/patches/series 2013-11-11 17:20:16.000000000 +0200 @@ -3,6 +3,6 @@ lesstif-multiarch fix-mtinkc-crash fix-mtink-crash -harden-askprinter +pass-hardening-flags fix-spelling-errors diff -Nru mtink-1.0.16/debian/rules mtink-1.0.16/debian/rules --- mtink-1.0.16/debian/rules 2012-02-07 01:30:44.000000000 +0200 +++ mtink-1.0.16/debian/rules 2013-11-11 17:35:16.000000000 +0200 @@ -24,6 +24,12 @@ include /usr/share/cdbs/1/class/makefile.mk include $(CURDIR)/debian/mk/docbook-manpage.mk +export DEB_BUILD_MAINT_OPTIONS = hardening=+all,-pie +export DEB_CFLAGS_MAINT_APPEND = -Wall +export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed +include /usr/share/dpkg/buildflags.mk +CFLAGS+=$(CPPFLAGS) + PACKAGE = mtink DESTDIR = $(CURDIR)/debian/$(PACKAGE)
