diff -Nru jamnntpd-1.2/debian/changelog jamnntpd-1.3/debian/changelog --- jamnntpd-1.2/debian/changelog 2014-05-20 17:47:55.000000000 +0000 +++ jamnntpd-1.3/debian/changelog 2017-10-10 17:15:22.000000000 +0000 @@ -1,3 +1,23 @@ +jamnntpd (1.3-1) unstable; urgency=medium + + * New Upstream Release. + * Changes to debian/control: + Use https URL for the 'Vcs-Git' keyword. + Use https URL for the 'Vcs-Browser' keyword. + Declare compliance with Debian Policy 4.1.1. + Add 'lsb-base (>= 3.0-6)' to the Depends setting. + Remove the 'jamnntpd-dbg' stanza as no longer necessary. + Update the Debhelper Build-Depends version to '>= 9.20151219'. + * Changes to debian/copyright: + Change 'Copyright-Format 1.0' URL to use HTTPS. + Update copyright years for the 'debian/*' Files stanza. + Add Robert James Clay to the 'Files: *' stanza. + * Changes to debian/rules: + Add setting of hardening flags for package build. + Update 'override_dh_strip' target for dbgsym migration. + + -- Robert James Clay Tue, 10 Oct 2017 13:15:22 -0400 + jamnntpd (1.2-1) unstable; urgency=low * Initial release. (Closes: #223905) diff -Nru jamnntpd-1.2/debian/control jamnntpd-1.3/debian/control --- jamnntpd-1.2/debian/control 2014-05-20 17:47:55.000000000 +0000 +++ jamnntpd-1.3/debian/control 2017-10-10 17:15:22.000000000 +0000 @@ -1,30 +1,19 @@ Source: jamnntpd Section: news -Priority: extra +Priority: optional Maintainer: Robert James Clay -Build-Depends: debhelper (>= 9.0.0) -Standards-Version: 3.9.5 +Build-Depends: debhelper (>= 9.20151219) +Standards-Version: 4.1.1 Homepage: http://ftnapps.sourceforge.net/jamnntpd.html -Vcs-Git: git://git.code.sf.net/p/ftnapps/jamnntpd/code -Vcs-Browser: http://sourceforge.net/p/ftnapps/jamnntpd/code +Vcs-Git: https://git.code.sf.net/p/ftnapps/jamnntpd/code +Vcs-Browser: https://sourceforge.net/p/ftnapps/jamnntpd/code Package: jamnntpd Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends} +Depends: lsb-base (>= 3.0-6), ${shlibs:Depends}, ${misc:Depends} Recommends: crashmail Description: NNTP Server allowing newsreaders to access a JAM messagebase JamNNTPd is an attempt to merge Fidonet technology with modern Usenet newsreaders. Basically, JamNNTPd is NNTP server that allows newsreaders to access a JAM messagebase. (If you didn't understand a word of this, you may not want to use JamNNTPd anyway). - -Package: jamnntpd-dbg -Architecture: any -Section: debug -Depends: jamnntpd (= ${binary:Version}), ${misc:Depends} -Description: debugging symbols for jamnntpd - JamNNTPd is an attempt to merge Fidonet technology with modern Usenet - newsreaders. Basically, JamNNTPd is NNTP server that allows newsreaders - to access a JAM messagebase. - . - This package contains the debugging symbols for jamnntpd. diff -Nru jamnntpd-1.2/debian/copyright jamnntpd-1.3/debian/copyright --- jamnntpd-1.2/debian/copyright 2014-05-20 17:47:55.000000000 +0000 +++ jamnntpd-1.3/debian/copyright 2017-10-10 17:15:22.000000000 +0000 @@ -1,9 +1,10 @@ -Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: jamnntpd Files: * Copyright: Copyright 2003-2005 Johan Billing 2009 Peter Krefting + 2016 Robert James Clay License: permissive The copyright of JamNNTPd belongs to Johan Billing. Permission to use, copy and distribute JamNNTPd is granted provided that this copyright notice is @@ -70,7 +71,7 @@ written authorization of the copyright holder. Files: debian/* -Copyright: 2013-2014 Robert James Clay +Copyright: 2013-2017 Robert James Clay License: GPL-2+ This package is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff -Nru jamnntpd-1.2/debian/rules jamnntpd-1.3/debian/rules --- jamnntpd-1.2/debian/rules 2014-05-20 17:47:55.000000000 +0000 +++ jamnntpd-1.3/debian/rules 2017-10-10 17:15:22.000000000 +0000 @@ -1,6 +1,10 @@ #!/usr/bin/make -f # debian/rules for jamnntpd +export DEB_BUILD_MAINT_OPTIONS = hardening=+all +DPKG_EXPORT_BUILDFLAGS = 1 +include /usr/share/dpkg/buildflags.mk + %: dh $@ @@ -20,6 +24,6 @@ dh_installdocs --link-doc=jamnntpd override_dh_strip: - dh_strip --dbg-package=jamnntpd-dbg + dh_strip --dbgsym-migration='jamnntpd-dbg (<< 1.3-1~)' -.PHONY: override_dh_strip \ No newline at end of file +.PHONY: override_dh_strip diff -Nru jamnntpd-1.2/examples/jamnntpd.users jamnntpd-1.3/examples/jamnntpd.users --- jamnntpd-1.2/examples/jamnntpd.users 2010-07-11 20:00:45.000000000 +0000 +++ jamnntpd-1.3/examples/jamnntpd.users 2016-09-10 18:17:49.000000000 +0000 @@ -1,4 +1,4 @@ -# User configuration file for JamNNTd +# User configuration file for JamNNTPd # # Syntax: # diff -Nru jamnntpd-1.2/History.txt jamnntpd-1.3/History.txt --- jamnntpd-1.2/History.txt 2010-07-11 20:00:45.000000000 +0000 +++ jamnntpd-1.3/History.txt 2016-09-10 18:17:49.000000000 +0000 @@ -1,4 +1,19 @@ +Changes in version 1.3 + + - Correct the order for how 'min' & 'max' are listed in the command + NNTP LIST [ACTIVE] in src/nntpserv.c from 'group min max flag' to + 'group max min flag'. Reference RFC 3977 (and its ancestor RFC 977), + where they note that 'max' comes before 'min'. Thanks go to + Urs Janßen . + Closes https://sourceforge.net/p/ftnapps/jamnntpd/tickets/4/ + + - Correct XOVER response by adding an extra '\t' character to line 1381 + of src/nntpserv.c. Thanks to mark.lewis@p0.f12.n3634.z1.fidonet.org. + Closes https://sourceforge.net/p/ftnapps/jamnntpd/tickets/5/ + + - Correct spelling of 'JamNNTd' as 'JamNNTPd' in examples/jamnntpd.users. + Changes in version 1.2 - Make From addresses into valid RFC 5322 addresses. diff -Nru jamnntpd-1.2/ReadMe.txt jamnntpd-1.3/ReadMe.txt --- jamnntpd-1.2/ReadMe.txt 2010-07-11 20:00:45.000000000 +0000 +++ jamnntpd-1.3/ReadMe.txt 2016-09-10 18:17:49.000000000 +0000 @@ -1,11 +1,11 @@ - JamNNTPd 1.2 + JamNNTPd 1.3 Copyright 2003-2005, Johan Billing (billing@df.lth.se) Copyright 2009, Peter Krefting (peter@softwolves.pp.se) - Copyright 2008, 2010, Robert James Clay (jame@rocasa.us) + Copyright 2008-2016 Robert James Clay (jame@rocasa.us) - 2010-07-11 + 2016-09-10 1. Introduction diff -Nru jamnntpd-1.2/src/nntpserv.c jamnntpd-1.3/src/nntpserv.c --- jamnntpd-1.2/src/nntpserv.c 2010-07-11 20:00:45.000000000 +0000 +++ jamnntpd-1.3/src/nntpserv.c 2016-09-10 18:17:49.000000000 +0000 @@ -373,10 +373,10 @@ } if(matchgroup(var->postgroups,g->group)) - sockprintf(var,"%s %lu %lu y" CRLF,g->tagname,min,max); + sockprintf(var,"%s %lu %lu y" CRLF,g->tagname,max,min); else - sockprintf(var,"%s %lu %lu n" CRLF,g->tagname,min,max); + sockprintf(var,"%s %lu %lu n" CRLF,g->tagname,max,min); } } } @@ -1378,7 +1378,7 @@ stripctrl(mimesubj); stripctrl(mimefrom); - sprintf(xoverres,"%ld\t%s\t%s\t%s\t%s\t%s\t\t" CRLF, + sprintf(xoverres,"%ld\t%s\t%s\t%s\t%s\t%s\t\t\t" CRLF, c,mimesubj,mimefrom,datebuf,msgid,reply); socksendtext(var,xoverres); diff -Nru jamnntpd-1.2/src/nntpserv.h jamnntpd-1.3/src/nntpserv.h --- jamnntpd-1.2/src/nntpserv.h 2010-07-11 20:00:45.000000000 +0000 +++ jamnntpd-1.3/src/nntpserv.h 2016-09-10 18:17:49.000000000 +0000 @@ -70,7 +70,7 @@ #define CRLF CR LF #define SERVER_NAME "JamNNTPd/" PLATFORM_NAME -#define SERVER_VERSION "1.2" +#define SERVER_VERSION "1.3" #define SERVER_PIDVERSION "1" #define SOCKIO_TIMEOUT 5*60