From 2a02540ff4520df4cf86669c1d66fc36d981ff71 Mon Sep 17 00:00:00 2001 From: Pierre-Yves Date: Sat, 15 Apr 2017 19:17:11 +0200 Subject: [PATCH] Update to 6.11.5 Creation of package.yml Fix: Exec paths in dhcpcd.service (T2960) --- abi_used_libs | 3 ++ actions.py | 26 ---------- component.xml | 4 -- files/dhcpcd.service | 4 +- files/security/cve-2014-6060.patch | 40 --------------- package.yml | 22 ++++++++ pspec.xml | 102 ------------------------------------- pspec_x86_64.xml | 45 ++++++++++++++++ 8 files changed, 72 insertions(+), 174 deletions(-) create mode 100644 abi_used_libs delete mode 100644 actions.py delete mode 100644 component.xml delete mode 100644 files/security/cve-2014-6060.patch create mode 100644 package.yml delete mode 100644 pspec.xml create mode 100644 pspec_x86_64.xml diff --git a/abi_used_libs b/abi_used_libs new file mode 100644 index 0000000..a2d323a --- /dev/null +++ b/abi_used_libs @@ -0,0 +1,3 @@ +libc.so.6 +libdl.so.2 +libudev.so.1 diff --git a/actions.py b/actions.py deleted file mode 100644 index 5efad62..0000000 --- a/actions.py +++ /dev/null @@ -1,26 +0,0 @@ - -#!/usr/bin/python - - -from pisi.actionsapi import shelltools, get, autotools, pisitools - -hookFile = "dhcpcd-hooks/50-dhcpcd-compat" - -def setup(): - # We'll run from /run - pisitools.dosed (hookFile, "/var/lib", "/run") - autotools.configure ("--libexecdir=/lib/dhcpcd\ - --dbdir=/run\ - --sysconfdir=/etc\ - --with-rootprefix=/ \ - CFLAGS=\"-D_GNU_SOURCE %s\"" % get.CFLAGS()) - -def build(): - autotools.make () - -def install(): - autotools.rawInstall("DESTDIR=%s" % get.installDIR()) - - pisitools.dodoc ("README") - - pisitools.insinto ("/lib/dhcpcd/dhcpcd-hooks/", hookFile) diff --git a/component.xml b/component.xml deleted file mode 100644 index 181f235..0000000 --- a/component.xml +++ /dev/null @@ -1,4 +0,0 @@ - - network.base - - diff --git a/files/dhcpcd.service b/files/dhcpcd.service index ea500b5..602aa06 100644 --- a/files/dhcpcd.service +++ b/files/dhcpcd.service @@ -3,8 +3,8 @@ Description=DHCP Client After=network.target [Service] Type=forking -ExecStart=/sbin/dhcpcd -ExecStop=/sbin/dhcpcd -k +ExecStart=/usr/sbin/dhcpcd +ExecStop=/usr/sbin/dhcpcd -k [Install] WantedBy=multi-user.target diff --git a/files/security/cve-2014-6060.patch b/files/security/cve-2014-6060.patch deleted file mode 100644 index d62f8c2..0000000 --- a/files/security/cve-2014-6060.patch +++ /dev/null @@ -1,40 +0,0 @@ -From a3164eb2cb737ec900945d703f954d36dcca3d0a Mon Sep 17 00:00:00 2001 -From: Ikey Doherty -Date: Thu, 11 Sep 2014 23:52:33 +0100 -Subject: [PATCH] dhcp: Backport fix from 6.4.3 for CVE-2014-6060 - -The get_option function in dhcpcd 4.0.0 through 6.x before 6.4.3 allows remote -DHCP servers to cause a denial of service by resetting the -DHO_OPTIONSOVERLOADED option in the (1) bootfile or (2) servername section, -which triggers the option to be processed again. - ---- -Backported from upstream commit - -Signed-off-by: Ikey Doherty ---- - dhcp.c | 7 +++++-- - 1 file changed, 5 insertions(+), 2 deletions(-) - -diff --git a/dhcp.c b/dhcp.c -index 6a08cf0..5e1cf7f 100644 ---- a/dhcp.c -+++ b/dhcp.c -@@ -354,9 +354,12 @@ get_option(const struct dhcp_message *dhcp, uint8_t opt, int *len, int *type) - goto exit; - break; - case DHO_OPTIONSOVERLOADED: -- /* Ensure we only get this option once */ -+ /* Ensure we only get this option once by setting -+ * the last bit as well as the value. -+ * This is valid because only the first two bits -+ * actually mean anything in RFC2132 Section 9.3 */ - if (!overl) -- overl = p[1]; -+ overl = 0x80 | p[1]; - break; - } - l = *p++; --- -1.8.4 - diff --git a/package.yml b/package.yml new file mode 100644 index 0000000..9bec888 --- /dev/null +++ b/package.yml @@ -0,0 +1,22 @@ +name : dhcpcd +version : 6.11.5 +release : 8 +source : + - https://roy.marples.name/downloads/dhcpcd/dhcpcd-6.11.5.tar.xz : 6f9674dc7e27e936cc787175404a6171618675ecfb6903ab9887b1b66a87d69e +homepage : https://roy.marples.name/projects/dhcpcd +license : BSD-2-Clause +component : network.base +summary : dhcpcd - a DHCP client +description: | + dhcpcd, a DHCP and DHCPv6 client. It's also an IPv4LL (aka ZeroConf) client. In layman's terms, dhcpcd runs on your machine and silently configures your computer to work on the attached networks without trouble and mostly without configuration. +setup : | + %patch -p1 < $pkgfiles/0001-Do-not-enforce-a-hostname-change.patch + %configure --disable-static +build : | + %make +install : | + %make_install + install -m 0644 -D $pkgfiles/dhcpcd.service $installdir%libdir%/systemd/system/dhcpcd.service + rm -fr $installdir/var + + diff --git a/pspec.xml b/pspec.xml deleted file mode 100644 index 571e7ef..0000000 --- a/pspec.xml +++ /dev/null @@ -1,102 +0,0 @@ - - - - - dhcpcd - http://roy.marples.name/projects/dhcpcd/ - - Evolve OS Packaging - packaging@evolve-os.com - - DHCP client and server - In layman's terms, dhcpcd runs on your machine and silently configures your computer to work on the attached networks without trouble and mostly without configuration. - LGPLv3+ - http://roy.marples.name/downloads/dhcpcd/dhcpcd-5.6.7.tar.bz2 - - - security/cve-2014-6060.patch - 0001-Do-not-enforce-a-hostname-change.patch - - - - - dhcpcd - - /etc - /lib - /run - /usr/sbin - /usr/share/doc - /usr/share/man - /usr/lib/systemd/system - - - dhcpcd.service - - - - - - 03-08-2016 - 5.6.7 - Package bump - Ikey Doherty - ikey@solus-project.com - - - - 03-06-2016 - 5.6.7 - Package bump - Ikey Doherty - ikey@solus-project.com - - - - 06-29-2015 - 5.6.7 - Package bump - Ikey Doherty - ikey@solus-project.com - - - - 09-12-2014 - 5.6.7 - Fix metainfo on previous update - Ikey Doherty - ikey@evolve-os.com - - systemRestart - - - - - 09-11-2014 - 5.6.7 - Address CVE-2014-6060 - Ikey Doherty - ikey@evolve-os.com - - systemRestart - - - - - 03-19-2013 - 5.6.7 - Add systemd script - Ikey Doherty - ikey@solusos.com - - - - 03-19-2013 - 5.6.7 - Add dhcpcd to repositories - Ikey Doherty - ikey@solusos.com - - - - \ No newline at end of file diff --git a/pspec_x86_64.xml b/pspec_x86_64.xml new file mode 100644 index 0000000..292b00a --- /dev/null +++ b/pspec_x86_64.xml @@ -0,0 +1,45 @@ + + + dhcpcd + https://roy.marples.name/projects/dhcpcd + + Pierre-Yves + pyu@skynet.be + + BSD-2-Clause + network.base + dhcpcd - a DHCP client + dhcpcd, a DHCP and DHCPv6 client. It's also an IPv4LL (aka ZeroConf) client. In layman's terms, dhcpcd runs on your machine and silently configures your computer to work on the attached networks without trouble and mostly without configuration. + + https://solus-project.com/sources/README.Solus + + + dhcpcd + dhcpcd - a DHCP client + dhcpcd, a DHCP and DHCPv6 client. It's also an IPv4LL (aka ZeroConf) client. In layman's terms, dhcpcd runs on your machine and silently configures your computer to work on the attached networks without trouble and mostly without configuration. + + network.base + + /etc/dhcpcd.conf + /usr/lib64/dhcpcd/dev/udev.so + /usr/lib64/dhcpcd/dhcpcd-hooks/01-test + /usr/lib64/dhcpcd/dhcpcd-hooks/02-dump + /usr/lib64/dhcpcd/dhcpcd-hooks/20-resolv.conf + /usr/lib64/dhcpcd/dhcpcd-hooks/30-hostname + /usr/lib64/dhcpcd/dhcpcd-run-hooks + /usr/lib64/systemd/system/dhcpcd.service + /usr/sbin + /usr/share/dhcpcd + /usr/share/man + + + + + 2017-04-15 + 6.11.5 + Packaging update + Pierre-Yves + pyu@skynet.be + + + \ No newline at end of file -- 2.12.2