Hi, attached are new patches for eudev: 3.2.2-8+devuan2:
0001-Rename-package-to-3.2.2-8-devuan2.patch
0002-debian-changelog-Add-
info-about-udev-libudev1-and-li.patch
Since the new version number is lower than the previous 3.2.2-devuan2.7
old versions have to be removed in experimental. When this version has
migrated to ASCII there would be no problems. Of course people who
already have installed versions 220:... and 3.2.2-devuan2.Y from
experimental have to downgrade. But I don't see this as a problem,
those who had installed eudev know what they are doing.
When this package migrates from experimental to ASCII I propose that we
increment the version, in this case to 3.2.2-9+devuan2, when built for
ASCII. This is the procedure used in Debian.
The patches complete the cleanup in debian/ directory, including
renaming, removal of upstart and systemd code, fix most lintian errors
and warnings etc. From the debian/changelog file:
[ Svante Signell ]
* debian/changelog: Rename package name to 3.2.2+8+devuan2. Other
fixes below.
* debian/control: Fix uploader name.
* debian/eudev.NEWS: Fix version and add info about the fork of
systemd.
* debian/eudev.postinst: Remove systemd code.
* debian/eudev.postrm: Add dh_purge.
* debian/eudev.preinst: Remove upstart and systemd code.
* debian/extra/udev-helpers/net.agent: Remove systemd code.
* debian/eudev.init: Remove upstart code.
* debian/source.lintian-overrides: Fix lintian warnings.
* debian/eudev.lintian-overrides: Fix lintian warnings and error.
* debian/libeudev1.lintian-overrides: Fix lintian warnings.
* debian/libeudev-dev.lintian-overrides: Fix lintian warnings.
* debian/libeudev1-udeb.lintian-overrides: Fix lintian warning: Not
effective!
* Transitional packages udev, libudev1 and libudev-dev are now real
3.0 (native) packages.
[ Hleb Valoshka ]
* debian/control: Fix hardcoded Replaces, Provides and Conflicts
entries.
* debian/copyright: Fix copyright files.
From 6eaf0945fd250e67951a5fc551ec9c6b36d2afbb Mon Sep 17 00:00:00 2001
From: Svante Signell <svante.signell@???>
Date: Sat, 2 Dec 2017 22:28:51 +0100
Subject: [PATCH 2/2] debian/changelog: Add info about udev, libudev1 and
libudev-dev now being real native packages.
---
debian/changelog | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/debian/changelog b/debian/changelog
index 482526a30..45cdbd2b9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,12 +14,13 @@ eudev (3.2.2-8+devuan2) experimental; urgency=medium
* debian/libeudev1.lintian-overrides: Fix lintian warnings.
* debian/libeudev-dev.lintian-overrides: Fix lintian warnings.
* debian/libeudev1-udeb.lintian-overrides: Fix lintian warning: Not effective!
+ * Transitional packages udev, libudev1 and libudev-dev are now real 3.0 (native) packages.
[ Hleb Valoshka ]
* debian/control: Fix hardcoded Replaces, Provides and Conflicts entries.
* debian/copyright: Fix copyright files.
- -- Svante Signell <svante.signell@???> Sat, 02 Dec 2017 10:52:23 +0100
+ -- Svante Signell <svante.signell@???> Sat, 02 Dec 2017 21:28:23 +0100
eudev (3.2.2-devuan2.7) experimental; urgency=medium
--
2.11.0
From 3a1d0b64c19fa705e08760161c1f7b7b0b1cf838 Mon Sep 17 00:00:00 2001
From: Svante Signell <svante.signell@???>
Date: Sat, 2 Dec 2017 22:02:09 +0100
Subject: [PATCH 1/2] Rename package to 3.2.2-8+devuan2. debian/control: Fix
uploader name. Fix hardcoded Replaces, Provides and Conflicts
entries. debian/eudev.NEWS: Fix version and add info about the fork of
systemd. debian/*: Remove systemd and upstart code.
debian/*.lintian-overrides: Fix lintian warnings and errors.
debian/copyright: Fix copyright files.
---
debian/changelog | 23 ++++++++++++++++
debian/control | 22 +++++++--------
debian/copyright | 47 +++------------------------------
debian/eudev.NEWS | 8 +++++-
debian/eudev.init | 6 -----
debian/eudev.lintian-overrides | 12 +++++++++
debian/eudev.postinst | 32 ----------------------
debian/eudev.postrm | 1 +
debian/eudev.preinst | 22 ---------------
debian/extra/udev-helpers/net.agent | 10 -------
debian/libeudev-dev.lintian-overrides | 2 ++
debian/libeudev1-udeb.lintian-overrides | 2 ++
debian/libeudev1.lintian-overrides | 4 +++
debian/source.lintian-overrides | 4 +++
14 files changed, 70 insertions(+), 125 deletions(-)
create mode 100644 debian/eudev.lintian-overrides
create mode 100644 debian/libeudev-dev.lintian-overrides
create mode 100644 debian/libeudev1-udeb.lintian-overrides
create mode 100644 debian/libeudev1.lintian-overrides
create mode 100644 debian/source.lintian-overrides
diff --git a/debian/changelog b/debian/changelog
index 15742e20c..482526a30 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,26 @@
+eudev (3.2.2-8+devuan2) experimental; urgency=medium
+
+ [ Svante Signell ]
+ * debian/changelog: Rename package name to 3.2.2+8+devuan2. Other fixes below.
+ * debian/control: Fix uploader name.
+ * debian/eudev.NEWS: Fix version and add info about the fork of systemd.
+ * debian/eudev.postinst: Remove systemd code.
+ * debian/eudev.postrm: Add dh_purge.
+ * debian/eudev.preinst: Remove upstart and systemd code.
+ * debian/extra/udev-helpers/net.agent: Remove systemd code.
+ * debian/eudev.init: Remove upstart code.
+ * debian/source.lintian-overrides: Fix lintian warnings.
+ * debian/eudev.lintian-overrides: Fix lintian warnings and error.
+ * debian/libeudev1.lintian-overrides: Fix lintian warnings.
+ * debian/libeudev-dev.lintian-overrides: Fix lintian warnings.
+ * debian/libeudev1-udeb.lintian-overrides: Fix lintian warning: Not effective!
+
+ [ Hleb Valoshka ]
+ * debian/control: Fix hardcoded Replaces, Provides and Conflicts entries.
+ * debian/copyright: Fix copyright files.
+
+ -- Svante Signell <svante.signell@???> Sat, 02 Dec 2017 10:52:23 +0100
+
eudev (3.2.2-devuan2.7) experimental; urgency=medium
* debian/control: Fix Provides and Conflicts entries.
diff --git a/debian/control b/debian/control
index bafb2abe8..0e79ac6e9 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: eudev
Section: admin
Priority: optional
Maintainer: parazyd <parazyd@???>
-Uploaders: Anto <aryanto@???>, gnu_srs <svante.signell@???>
+Uploaders: Svante Signell <svante.signell@???>, Anto <aryanto@???>
Standards-Version: 3.9.8
Vcs-Git: https://git.devuan.org/devuan-packages/eudev.git
Vcs-Browser: https://git.devuan.org/devuan-packages/eudev.git
@@ -33,11 +33,11 @@ Section: admin
Priority: important
Architecture: linux-any
Multi-Arch: foreign
-Provides: udev (= 1:3.2.2-devuan2.7)
-Conflicts: udev (<< 1:3.2.2-devuan2.7), hal
+Provides: udev (= 1:${source:Version})
+Conflicts: udev (<< 1:${source:Version}), hal
Replaces: udev (>= 215),
bash-completion (<< 1:2.1)
-Pre-Depends: ${misc:Pre-Depends}
+Pre-Depends: debconf, ${misc:Pre-Depends}
Depends: ${shlibs:Depends},
${misc:Depends},
adduser,
@@ -48,7 +48,7 @@ Depends: ${shlibs:Depends},
procps
Breaks: consolekit (<< 0.4.6-1),
kmod (<< 14),
- systemd,
+ systemd (>> 220),
plymouth (<< 0.9.0-7),
bash-completion (<< 1:2.1),
Description: /dev/ and hotplug management daemon
@@ -60,9 +60,9 @@ Section: libs
Priority: important
Architecture: linux-any
Multi-Arch: same
-Replaces: libudev1 (>= 215)
-Provides: libudev1 (= 1:3.2.2-devuan2.7)
-Conflicts: libudev1 (<< 1:3.2.2-devuan2.7)
+Replaces: libudev1 (<< 1:${source:Version})
+Provides: libudev1 (= 1:${source:Version})
+Conflicts: libudev1 (<< 1:${source:Version})
Pre-Depends: ${misc:Pre-Depends}
Depends: ${shlibs:Depends},
${misc:Depends}
@@ -74,9 +74,9 @@ Section: libdevel
Priority: optional
Architecture: linux-any
Multi-Arch: same
-Replaces: libudev-dev (>= 215)
-Provides: libudev-dev (= 1:3.2.2-devuan2.7)
-Conflicts: libudev-dev (<< 1:3.2.2-devuan2.7)
+Replaces: libudev-dev (<< 1:${source:Version})
+Provides: libudev-dev (= 1:${source:Version})
+Conflicts: libudev-dev (<< 1:${source:Version})
Pre-Depends: ${misc:Pre-Depends}
Depends: ${shlibs:Depends},
${misc:Depends},
diff --git a/debian/copyright b/debian/copyright
index c2b3d8237..1ea38aaf4 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -52,22 +52,15 @@ Copyright: 2008-2013 Kay Sievers <kay@???>
2014 Matthew Thode <prometheanfire@???>
2014 Tony Vroon <tony@???>
2014 Richard Yao <ryao@???>
-
-
License: LGPL-2.1+
-Files: src/shared/MurmurHash3.h
- src/shared/MurmurHash3.c
+Files: src/shared/MurmurHash2.h
+ src/shared/MurmurHash2.c
Copyright: 2008 Austin Appleby
License: public-domain
- MurmurHash3 was written by Austin Appleby, and is placed in the public
+ MurmurHash2 was written by Austin Appleby, and is placed in the public
domain. The author hereby disclaims copyright to this source code.
-Files: src/core/selinux-access.h
- src/core/selinux-access.c
-Copyright: 2012 Dan Walsh
-License: GPL-2+
-
Files: src/core/securebits.h
Copyright: Linus Torvalds <torvalds@???>
License: GPL-2
@@ -76,17 +69,6 @@ Files: src/shared/ioprio.h
Copyright: Jens Axboe <axboe@???>
License: GPL-2
-Files: src/shared/linux/auto_dev-ioctl.h
-Copyright: 2008 Red Hat, Inc.
- 2008 Ian Kent <raven@???>
-License: GPL-2+
-
-Files: src/shared/linux/seccomp-bpf.h
-Copyright: 2012 The Chromium OS Authors <chromium-os-dev@???>
- 2012 Will Drewry <wad@???>
- 2012 Kees Cook <keescook@???>
-License: GPL-2
-
Files: src/shared/sparse-endian.h
Copyright: 2012 Josh Triplett <josh@???>
License: Expat
@@ -97,20 +79,10 @@ Copyright: 2010 Canonical Ltd.
2010 Martin Pitt <martin.pitt@???>
License: GPL-2+
-Files: src/shared/linux/fanotify.h
-Copyright: 2009 Eric Paris <eparis@???>
-License: GPL-2
-
-Files: src/journal/lookup3.c
- src/journal/lookup3.h
-Copyright: 2006 Bob Jenkins
-License: public-domain
- You can use this free for any purpose. It's in the public domain. It has no
- warranty.
-
Files: src/udev/*
Copyright: 2004-2012 Kay Sievers <kay@???>
2003-2004 Greg Kroah-Hartman <greg@???>
+ 2003 IBM Corp.
2004 Chris Friesen <chris_friesen@???>
2004 David Zeuthen <david@???>
2005 SUSE Linux Products GmbH, Germany
@@ -133,17 +105,6 @@ Files: src/udev/udev-ctrl.c
Copyright: 2007-2012 Kay Sievers <kay@???>
License: LGPL-2.1+
-Files: src/udev/scsi_id/scsi.h
-Copyright: 2003 IBM Corp.
-License: GPL-2
-
-Files: src/systemd/sd-daemon.h
- src/systemd/sd-readahead.h
- src/libsystemd-daemon/sd-daemon.c
- src/readahead/sd-readahead.c
-Copyright: 2010 Lennart Poettering
-License: Expat
-
License: Expat
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to
diff --git a/debian/eudev.NEWS b/debian/eudev.NEWS
index abca3dde1..bbe17fe02 100644
--- a/debian/eudev.NEWS
+++ b/debian/eudev.NEWS
@@ -1,4 +1,10 @@
-systemd (220-7) unstable; urgency=medium
+eudev (3.2.2-8+devuan2) experimental; urgency=medium
+
+ eudev was forked as (215:1.9-1) from systemd (215-17) by Jaret Jay
+ Cantu <jaret@???> Thu, 14 May 2015.
+ Current Devuan version is (3.2.2-9+devuan2) Thu, 30 Nov 2017
+
+ This text is from: systemd (220-7).
The mechanism for providing stable network interface names changed.
Previously they were kept in /etc/udev/rules.d/70-persistent-net.rules
diff --git a/debian/eudev.init b/debian/eudev.init
index fe6d943a9..598de93f8 100644
--- a/debian/eudev.init
+++ b/debian/eudev.init
@@ -160,9 +160,6 @@ fi
case "$1" in
start)
- if init_is_upstart 2>/dev/null; then
- exit 1
- fi
if mountpoint -q /dev/; then
TMPFS_MOUNTED=1
elif [ -e "/dev/.udev/" ]; then
@@ -230,9 +227,6 @@ case "$1" in
;;
restart)
- if init_is_upstart 2>/dev/null; then
- exit 1
- fi
log_daemon_msg "Stopping the hotplug events dispatcher" "udevd"
if start-stop-daemon --stop --name udevd --user root --quiet --oknodo --retry 5; then
log_end_msg $?
diff --git a/debian/eudev.lintian-overrides b/debian/eudev.lintian-overrides
new file mode 100644
index 000000000..a103e384f
--- /dev/null
+++ b/debian/eudev.lintian-overrides
@@ -0,0 +1,12 @@
+# Needed:
+eudev: systemd-no-service-for-init-rcS-script eudev
+# FIXME: Remove older versions 3.2.2-devuan2.Y
+eudev: latest-debian-changelog-entry-without-new-version
+
+# FIXED:
+#eudev: missing-debconf-dependency-for-preinst
+#eudev: postrm-does-not-purge-debconf
+#eudev: maintainer-script-calls-systemctl postinst:139
+#eudev: debian-news-entry-has-unknown-version 220-7
+#eudev: breaks-without-version systemd
+
diff --git a/debian/eudev.postinst b/debian/eudev.postinst
index e6df45ecd..a0f088226 100644
--- a/debian/eudev.postinst
+++ b/debian/eudev.postinst
@@ -122,25 +122,6 @@ update_hwdb() {
udevadm hwdb --update --usr || true
}
-# In udev-204, we ship systemd-udevd.service (upstream name), whereas previous
-# versions used udev.service. We replace udev.service with a symlink to
-# systemd-udevd.service, but systemd (both 44 and 204) exposes weird behavior:
-# After a daemon-reload, it forgets about the /sbin/udevd process in the
-# udev.service cgroup, so a restart will lead to having two udevd processes
-# running — one in the udev.service cgroup and one in the systemd-udevd.service
-# cgroup.
-#
-# To fix this, we explicitly stop udev.service and the corresponding sockets,
-# then issue the daemon-reload, then restart the new systemd-udevd.service (via
-# invoke-rc.d).
-handle_service_rename() {
- if dpkg --compare-versions "$2" lt "204-1"; then
- if [ -d /run/systemd/system ]; then
- systemctl stop udev.service udev-control.socket udev-kernel.socket >/dev/null 2>&1 || true
- fi
- fi
-}
-
case "$1" in
configure)
# update/create hwdb before we (re)start udev
@@ -162,33 +143,20 @@ case "$1" in
echo "Please reboot the system as soon as possible."
rm /etc/udev/kernel-upgrade
elif can_start_udevd; then
- handle_service_rename
- rm -f /run/systemd/system/systemd-udevd.service
- rm -f /run/systemd/system/udev.service
- # This is necessary for the handle_service_rename case, but does not
- # hurt in general (invoke-rc.d does it, too).
- if [ -d /run/systemd/system ] ; then
- systemctl daemon-reload || true
- fi
invoke-rc.d udev restart
echo "
*******************************************************
-
Warning: eudev will default to the older network
interface names, such as eth0 or wlan0. If you use
the new names, such as enp0s3, you will need to add
the following to the boot command:
-
net.ifnames=1
-
********************************************************
"
-
fi
fi
fi
-
update_initramfs
;;
diff --git a/debian/eudev.postrm b/debian/eudev.postrm
index 8658f764c..9824f261e 100644
--- a/debian/eudev.postrm
+++ b/debian/eudev.postrm
@@ -6,6 +6,7 @@ case "$1" in
rmdir --ignore-fail-on-non-empty /etc/udev/rules.d/ 2> /dev/null || true
rm -f /lib/udev/hwdb.bin
rm -f /var/log/udev
+ db_purge
;;
esac
diff --git a/debian/eudev.preinst b/debian/eudev.preinst
index 0362ac6fe..9755c5247 100644
--- a/debian/eudev.preinst
+++ b/debian/eudev.preinst
@@ -201,23 +201,6 @@ mv_conffile() {
fi
}
-mask_systemd_service() {
- if [ -x '/bin/systemctl' -a -d '/run/systemd/system/' ]; then
- ln -sf /dev/null /run/systemd/system/systemd-udevd.service
- ln -sf /dev/null /run/systemd/system/udev.service
- systemctl daemon-reload || true
- fi
-}
-
-stop_on_upstart_upgrade() {
- if which initctl >/dev/null && initctl version | grep -q upstart
- then
- # We have to stop udev before we can restart it under upstart in the
- # postinst.
- invoke-rc.d udev stop
- fi
-}
-
check_version() {
# $2 is non-empty when installing from the "config-files" state
[ "$2" ] || return 0
@@ -236,10 +219,6 @@ check_version() {
rm_conffile /etc/modprobe.d/blacklist.conf
fi # 175-1
- if dpkg --compare-versions $2 lt 175-7.1; then
- stop_on_upstart_upgrade
- fi # 175-7.1
-
if dpkg --compare-versions $2 lt 204-4; then
# suppress errors when the new rules files contain options not supported by
# the old daemon
@@ -256,7 +235,6 @@ case "$1" in
upgrade|abort-upgrade)
check_version "$@"
- mask_systemd_service
;;
*)
diff --git a/debian/extra/udev-helpers/net.agent b/debian/extra/udev-helpers/net.agent
index e06e8595b..1eac2a85c 100755
--- a/debian/extra/udev-helpers/net.agent
+++ b/debian/extra/udev-helpers/net.agent
@@ -38,10 +38,6 @@ net_ifup() {
exit 0
fi
- if [ -d /run/systemd/system ]; then
- exec systemctl --no-block start $(systemd-escape --template ifup@.service $INTERFACE)
- fi
-
if ps -C ifup ho args | grep -q "$INTERFACE"; then
debug_mesg "Already ifup-ing interface $INTERFACE"
exit 0
@@ -55,12 +51,6 @@ net_ifup() {
net_ifdown() {
check_program /sbin/ifdown
- # systemd will automatically ifdown the interface on device
- # removal by binding the instanced service to the network device
- if [ -d /run/systemd/system ]; then
- exit 0
- fi
-
if ps -C ifdown ho args | grep -q $INTERFACE; then
debug_mesg "Already ifdown-ing interface $INTERFACE"
exit 0
diff --git a/debian/libeudev-dev.lintian-overrides b/debian/libeudev-dev.lintian-overrides
new file mode 100644
index 000000000..16ef05ff0
--- /dev/null
+++ b/debian/libeudev-dev.lintian-overrides
@@ -0,0 +1,2 @@
+#FIXME: Remove older versions 3.2.2-devuan2.Y
+libeudev-dev: latest-debian-changelog-entry-without-new-version
diff --git a/debian/libeudev1-udeb.lintian-overrides b/debian/libeudev1-udeb.lintian-overrides
new file mode 100644
index 000000000..91958e183
--- /dev/null
+++ b/debian/libeudev1-udeb.lintian-overrides
@@ -0,0 +1,2 @@
+# Needed: Does not work??
+libeudev1-udeb udeb: package-name-doesnt-match-sonames libudev1
diff --git a/debian/libeudev1.lintian-overrides b/debian/libeudev1.lintian-overrides
new file mode 100644
index 000000000..7679b819d
--- /dev/null
+++ b/debian/libeudev1.lintian-overrides
@@ -0,0 +1,4 @@
+# Needed:
+libeudev1: package-name-doesnt-match-sonames libudev1
+# FIXME: Remove older versions 3.2.2-devuan2.Y
+libeudev1: latest-debian-changelog-entry-without-new-version
diff --git a/debian/source.lintian-overrides b/debian/source.lintian-overrides
new file mode 100644
index 000000000..e30a7bd01
--- /dev/null
+++ b/debian/source.lintian-overrides
@@ -0,0 +1,4 @@
+# FIXED:
+#eudev source: missing-field-in-dep5-copyright license (paragraph at line 16)
+#eudev source: missing-license-text-in-dep5-copyright LGPL-2.1+ (paragraph at line 57)
+
--
2.11.0
::
[devuan-dev] New patches for eudev …
