Christoph Biedl wrote... > time has passed, and unfortunately it's too late now to salvage > inspircd in time to bring it into buster. So I'd like to to a regular > upload, adding myself as an uploader. > > I'd highly appreciate your short ACK on this. debdiff on debian/ > attached.
Given the small time frame left, I've prepared an upload, will be sent
to DELAYED/3 in a few moments.
Full list of changes:
* new upstream version
* addd myself to uploaders
* fixed debian/watch so release candidates are ignored
* changed /var/run to /run in inspircd.tmpfile
* added SuccessExitStatus= to inspircd.service so "stop" does not
end in a "failed" unit status
Updated debdiff attached.
Cheers,
Christoph
diff -Nru inspircd-2.0.24/debian/changelog inspircd-2.0.27/debian/changelog
--- inspircd-2.0.24/debian/changelog 2018-06-17 21:06:10.000000000 +0200
+++ inspircd-2.0.27/debian/changelog 2019-02-25 21:28:51.000000000 +0100
@@ -1,3 +1,10 @@
+inspircd (2.0.27-1) unstable; urgency=medium
+
+ * New upstream version 2.0.27 (Closes: #910462)
+ * Add myself to uploaders
+
+ -- Christoph Biedl <debian.a...@manchmal.in-ulm.de> Mon, 25 Feb 2019
21:28:51 +0100
+
inspircd (2.0.24-1.1) unstable; urgency=medium
* Non-maintainer upload
diff -Nru inspircd-2.0.24/debian/control inspircd-2.0.27/debian/control
--- inspircd-2.0.24/debian/control 2018-06-17 21:06:10.000000000 +0200
+++ inspircd-2.0.27/debian/control 2019-02-25 21:28:43.000000000 +0100
@@ -2,7 +2,9 @@
Section: net
Priority: optional
Maintainer: inspircd packagers <inspi...@packages.debian.org>
-Uploaders: Guillaume Delacour <g...@iroqwa.org>
+Uploaders:
+ Guillaume Delacour <g...@iroqwa.org>,
+ Christoph Biedl <debian.a...@manchmal.in-ulm.de>,
Build-Depends: debhelper (>= 9.0.0), perl, libgnutls28-dev, pkg-config,
libldap2-dev, libpcre3-dev, default-libmysqlclient-dev,
libpq-dev,
libsqlite3-dev, zlib1g-dev, libgeoip-dev,
diff -Nru inspircd-2.0.24/debian/inspircd.service
inspircd-2.0.27/debian/inspircd.service
--- inspircd-2.0.24/debian/inspircd.service 2018-04-07 10:00:42.000000000
+0200
+++ inspircd-2.0.27/debian/inspircd.service 2019-02-25 21:28:44.000000000
+0100
@@ -5,6 +5,7 @@
[Service]
User=irc
ExecStart=/usr/sbin/inspircd --logfile /var/log/inspircd.log --config
/etc/inspircd/inspircd.conf --nofork
+SuccessExitStatus=15
[Install]
WantedBy=multi-user.target
diff -Nru inspircd-2.0.24/debian/inspircd.tmpfile
inspircd-2.0.27/debian/inspircd.tmpfile
--- inspircd-2.0.24/debian/inspircd.tmpfile 2018-04-07 10:00:42.000000000
+0200
+++ inspircd-2.0.27/debian/inspircd.tmpfile 2019-02-25 21:28:44.000000000
+0100
@@ -1,2 +1,2 @@
-f /var/run/inspircd.pid 0644 irc irc
+f /run/inspircd.pid 0644 irc irc
f /var/log/inspircd.log 0640 irc adm
diff -Nru inspircd-2.0.24/debian/patches/01_dpkg-buildflags_support.diff
inspircd-2.0.27/debian/patches/01_dpkg-buildflags_support.diff
--- inspircd-2.0.24/debian/patches/01_dpkg-buildflags_support.diff
2018-04-07 10:00:42.000000000 +0200
+++ inspircd-2.0.27/debian/patches/01_dpkg-buildflags_support.diff
2019-02-23 13:22:28.000000000 +0100
@@ -19,7 +19,7 @@
CORELDFLAGS = -rdynamic -L. $(LDFLAGS)
PICLDFLAGS = -fPIC -shared -rdynamic $(LDFLAGS)
BASE = "$(DESTDIR)@BASE_DIR@"
-@@ -132,7 +133,7 @@ CXXFLAGS += -Iinclude
+@@ -139,7 +140,7 @@ CXXFLAGS += -Iinclude
@ENDIF
@DO_EXPORT RUNCC RUNLD CXXFLAGS LDLIBS PICLDFLAGS VERBOSE SOCKETENGINE
CORELDFLAGS
@@ -32,7 +32,7 @@
===================================================================
--- inspircd-2.0.16.orig/make/unit-cc.pl
+++ inspircd-2.0.16/make/unit-cc.pl
-@@ -79,6 +79,10 @@ sub do_static_link {
+@@ -95,6 +95,10 @@ sub do_static_link {
}
sub do_core_link {
@@ -43,7 +43,7 @@
my $execstr = "$ENV{RUNLD} -o $out $ENV{CORELDFLAGS} @_ $ENV{LDLIBS}";
print "$execstr\n" if $verbose;
exec $execstr;
-@@ -98,6 +102,7 @@ sub do_compile {
+@@ -114,6 +118,7 @@
my $binary = $ENV{RUNCC};
if ($do_compile) {
$flags = $ENV{CXXFLAGS};
diff -Nru inspircd-2.0.24/debian/patches/04_reproducible_builds.diff
inspircd-2.0.27/debian/patches/04_reproducible_builds.diff
--- inspircd-2.0.24/debian/patches/04_reproducible_builds.diff 2018-04-07
10:00:42.000000000 +0200
+++ inspircd-2.0.27/debian/patches/04_reproducible_builds.diff 2019-02-23
13:22:28.000000000 +0100
@@ -10,7 +10,7 @@
===================================================================
--- inspircd.orig/src/inspircd.cpp
+++ inspircd/src/inspircd.cpp
-@@ -511,7 +511,7 @@ InspIRCd::InspIRCd(int argc, char** argv
+@@ -518,7 +518,7 @@ InspIRCd::InspIRCd(int argc, char** argv
}
}
@@ -23,7 +23,7 @@
===================================================================
--- inspircd.orig/src/users.cpp
+++ inspircd/src/users.cpp
-@@ -785,7 +785,8 @@ void LocalUser::FullConnect()
+@@ -786,7 +786,8 @@ void LocalUser::FullConnect()
this->WriteServ("NOTICE Auth :Welcome to
\002%s\002!",ServerInstance->Config->Network.c_str());
this->WriteNumeric(RPL_WELCOME, "%s :Welcome to the %s IRC Network
%s",this->nick.c_str(), ServerInstance->Config->Network.c_str(),
GetFullRealHost().c_str());
this->WriteNumeric(RPL_YOURHOSTIS, "%s :Your host is %s, running
version
%s",this->nick.c_str(),ServerInstance->Config->ServerName.c_str(),BRANCH);
@@ -50,7 +50,7 @@
===================================================================
--- inspircd.orig/configure
+++ inspircd/configure
-@@ -859,7 +859,7 @@ my ($mliflags, $mfrules, $mobjs, $mfcoun
+@@ -833,7 +833,7 @@ my ($mliflags, $mfrules, $mobjs, $mfcoun
sub writefiles {
my($writeheader) = @_;
# First File.. inspircd_config.h
diff -Nru inspircd-2.0.24/debian/watch inspircd-2.0.27/debian/watch
--- inspircd-2.0.24/debian/watch 2018-04-07 10:00:42.000000000 +0200
+++ inspircd-2.0.27/debian/watch 2019-02-23 13:09:43.000000000 +0100
@@ -1,4 +1,4 @@
version=3
opts=uversionmangle=s/^(2\.1(?:fork|b[123]|a[12]))$/0.0.$1/ \
https://github.com/inspircd/inspircd/releases \
-.*/archive/v(\d\S*)\.tar\.gz
+.*/archive/v([0-9.]+)\.tar\.gz
signature.asc
Description: PGP signature
