tags 690067 +patch
thanks
On Tue, Dec 11, 2012 at 12:13:37PM +0100, Gergely Nagy wrote:
> Csillag Tamas <csta...@digitus.itk.ppke.hu> writes:
>
> > The patch seems fine to me.
> > Is something missing? Is something still needs to be done?
>
> I still need to prep the other things. I most likely will have time this
> coming friday.
>
> For the record, pretty much everything that needs to be fixed, is fixed
> in my tree[1], on either on my packaging/debian/3.3 or
> packaging/debian/3.4 branches - all the work left now is to diff the
> packaging against those trees, and pick the relevant fixes for this bug,
> and others.
>
> [1]: https://github.com/algernon/syslog-ng/
I've prepared an NMU based on the changes in that git repository;
debdiff attached. I will do a delayed upload later on today.
--
Dominic Hargreaves | http://www.larted.org.uk/~dom/
PGP key 5178E2A5 from the.earth.li (keyserver,web,email)
diff -Nru syslog-ng-3.3.6/debian/changelog syslog-ng-3.3.6/debian/changelog
--- syslog-ng-3.3.6/debian/changelog 2012-10-02 23:59:03.000000000 +0100
+++ syslog-ng-3.3.6/debian/changelog 2013-03-02 12:18:19.000000000 +0000
@@ -1,3 +1,12 @@
+syslog-ng (3.3.6-1.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Instead of installing systemd service file symlinks, install
+ conffiles that includes the real service file. Based on changes from
+ Gergely Nagy's git repository (Closes: #690067)
+
+ -- Dominic Hargreaves <d...@earth.li> Sat, 02 Mar 2013 12:18:07 +0000
+
syslog-ng (3.3.6-1) unstable; urgency=low
* New upstream release:
diff -Nru syslog-ng-3.3.6/debian/syslog-ng-core.conffiles
syslog-ng-3.3.6/debian/syslog-ng-core.conffiles
--- syslog-ng-3.3.6/debian/syslog-ng-core.conffiles 2012-05-05
10:21:51.000000000 +0100
+++ syslog-ng-3.3.6/debian/syslog-ng-core.conffiles 1970-01-01
01:00:00.000000000 +0100
@@ -1,2 +0,0 @@
-/etc/systemd/system/multi-user.target.wants/syslog-ng.service
-/etc/systemd/system/syslog.service
diff -Nru syslog-ng-3.3.6/debian/syslog-ng-core.install
syslog-ng-3.3.6/debian/syslog-ng-core.install
--- syslog-ng-3.3.6/debian/syslog-ng-core.install 2012-05-05
10:22:46.000000000 +0100
+++ syslog-ng-3.3.6/debian/syslog-ng-core.install 2013-03-02
11:34:41.000000000 +0000
@@ -16,4 +16,6 @@
usr/lib/syslog-ng/*/libsyslogformat.so
usr/share/syslog-ng/include/scl/*
usr/share/syslog-ng/xsd/*
-debian/syslog-ng.conf /etc/syslog-ng/
+debian/syslog-ng.conf /etc/syslog-ng/
+debian/systemd/syslog-ng.service /etc/systemd/system/
+debian/systemd/syslog-ng.service
/etc/systemd/system/multi-user.target.wants/
diff -Nru syslog-ng-3.3.6/debian/syslog-ng-core.links
syslog-ng-3.3.6/debian/syslog-ng-core.links
--- syslog-ng-3.3.6/debian/syslog-ng-core.links 2012-09-30 19:23:30.000000000
+0100
+++ syslog-ng-3.3.6/debian/syslog-ng-core.links 1970-01-01 01:00:00.000000000
+0100
@@ -1,2 +0,0 @@
-lib/systemd/system/syslog-ng.service etc/systemd/system/syslog.service
-lib/systemd/system/syslog-ng.service
etc/systemd/system/multi-user.target.wants/syslog-ng.service
diff -Nru syslog-ng-3.3.6/debian/syslog-ng-core.postrm
syslog-ng-3.3.6/debian/syslog-ng-core.postrm
--- syslog-ng-3.3.6/debian/syslog-ng-core.postrm 2012-09-30
19:23:30.000000000 +0100
+++ syslog-ng-3.3.6/debian/syslog-ng-core.postrm 2013-03-02
11:32:36.000000000 +0000
@@ -15,17 +15,6 @@
rm -f /var/lib/syslog-ng/syslog-ng.ctl /var/lib/syslog-ng/syslog-ng.persist
[ -d /var/lib/syslog-ng/ ] && rmdir --ignore-fail-on-non-empty
/var/lib/syslog-ng/
-
- # Clean up the systemd files & dirs too. Because the files are
- # symlinks, dpkg does not remove them, even if they're marked
- # conffiles, so we do it ourselves.
- rm -f /etc/systemd/system/multi-user.target.wants/syslog-ng.service \
- /etc/systemd/system/syslog.service \
-
/etc/systemd/system/multi-user.target.wants/syslog-ng.service.dpkg-new \
- /etc/systemd/system/syslog.service.dpkg-new
- rmdir --ignore-fail-on-non-empty
/etc/systemd/system/multi-user.target.wants
- rmdir --ignore-fail-on-non-empty /etc/systemd/system
- rmdir --ignore-fail-on-non-empty /etc/systemd
fi
#DEBHELPER#
diff -Nru syslog-ng-3.3.6/debian/syslog-ng-core.preinst
syslog-ng-3.3.6/debian/syslog-ng-core.preinst
--- syslog-ng-3.3.6/debian/syslog-ng-core.preinst 2012-05-03
11:34:59.000000000 +0100
+++ syslog-ng-3.3.6/debian/syslog-ng-core.preinst 2013-03-02
12:17:52.000000000 +0000
@@ -12,6 +12,16 @@
fi
fi
+if [ "$1" = "install" -o "$1" = "upgrade" ]; then
+ # Earlier versions of the package installed symlink conffiles
+ # which don't work (#690067)
+ for file_to_remove in
/etc/systemd/system/multi-user.target.wants/syslog-ng.service
/etc/systemd/system/syslog.service; do
+ if [ -L $file_to_remove ]; then
+ rm $file_to_remove
+ fi
+ done
+fi
+
#DEBHELPER#
exit 0
diff -Nru syslog-ng-3.3.6/debian/systemd/syslog-ng.service
syslog-ng-3.3.6/debian/systemd/syslog-ng.service
--- syslog-ng-3.3.6/debian/systemd/syslog-ng.service 1970-01-01
01:00:00.000000000 +0100
+++ syslog-ng-3.3.6/debian/systemd/syslog-ng.service 2013-03-02
11:32:36.000000000 +0000
@@ -0,0 +1 @@
+.include /lib/systemd/system/syslog-ng.service
