diff options
Diffstat (limited to 'core')
-rw-r--r-- | core/dhcpcd/PKGBUILD | 23 | ||||
-rw-r--r-- | core/dhcpcd/commit_9eaeccdf1d.diff | 191 | ||||
-rw-r--r-- | core/dhcpcd/commit_e348e99776.diff | 17 | ||||
-rw-r--r-- | core/sudo/PKGBUILD | 18 | ||||
-rw-r--r-- | core/sudo/sudo.install | 19 | ||||
-rw-r--r-- | core/sudo/sudo.tmpfiles.conf | 1 |
6 files changed, 41 insertions, 228 deletions
diff --git a/core/dhcpcd/PKGBUILD b/core/dhcpcd/PKGBUILD index 62506015b..2967f3bb4 100644 --- a/core/dhcpcd/PKGBUILD +++ b/core/dhcpcd/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 207747 2014-03-14 14:31:40Z anatolik $ +# $Id: PKGBUILD 208219 2014-03-19 12:29:50Z anatolik $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Tom Killian <tom.archlinux.org> # Contributor: Judd Vinet <jvinet.zeroflux.org> pkgname=dhcpcd -pkgver=6.3.1 -pkgrel=2 +pkgver=6.3.2 +pkgrel=1 pkgdesc="RFC2131 compliant DHCP client daemon" url="http://roy.marples.name/projects/dhcpcd/" arch=('i686' 'x86_64') @@ -17,21 +17,10 @@ backup=('etc/dhcpcd.conf') options=('emptydirs') # We Need the Empty /var/lib/dhcpcd Directory source=("http://roy.marples.name/downloads/$pkgname/$pkgname-$pkgver.tar.bz2" 'dhcpcd_.service' - 'dhcpcd.service' - 'commit_9eaeccdf1d.diff' - 'commit_e348e99776.diff') -sha1sums=('4db014c7eeca57fea7f954640e68feaa1d249c79' + 'dhcpcd.service') +sha1sums=('ff8ef22b7305795eff52b8b41b81e2999a5923ff' '6f1633edde14d29b5cdc09c4f029a450ef2ebc96' - '52c1bad9ab43e9a253c1eb175e7eefb13497b8f9' - '6a381ec2638eba6812a76b0f362e59f283c30168' - 'c81283b4918370992f2f717a3139a23748c6a46d') - -prepare() { - cd "${srcdir}/${pkgname}-${pkgver}" - - patch -p0 -i "${srcdir}/commit_9eaeccdf1d.diff" - patch -p0 -i "${srcdir}/commit_e348e99776.diff" -} + '52c1bad9ab43e9a253c1eb175e7eefb13497b8f9') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/core/dhcpcd/commit_9eaeccdf1d.diff b/core/dhcpcd/commit_9eaeccdf1d.diff deleted file mode 100644 index 5653dce60..000000000 --- a/core/dhcpcd/commit_9eaeccdf1d.diff +++ /dev/null @@ -1,191 +0,0 @@ -Index: auth.c -================================================================== ---- auth.c -+++ auth.c -@@ -229,10 +229,15 @@ - errno = EINVAL; - return NULL; - } - if (state->reconf == NULL) - errno = ENOENT; -+ /* Free the old token so we log acceptance */ -+ if (state->token) { -+ free(state->token); -+ state->token = NULL; -+ } - /* Nothing to validate, just accepting the key */ - return state->reconf; - case 2: - if (!((mp == 4 && mt == DHCP_FORCERENEW) || - (mp == 6 && mt == DHCP6_RECONFIGURE))) - -Index: dhcp.c -================================================================== ---- dhcp.c -+++ dhcp.c -@@ -1059,12 +1059,16 @@ - syslog(LOG_DEBUG, "%s: dhcp_auth_validate: %m", - ifp->name); - free(dhcp); - return NULL; - } -- syslog(LOG_DEBUG, "%s: validated using 0x%08" PRIu32, -- ifp->name, state->auth.token->secretid); -+ if (state->auth.token) -+ syslog(LOG_DEBUG, "%s: validated using 0x%08" PRIu32, -+ ifp->name, state->auth.token->secretid); -+ else -+ syslog(LOG_DEBUG, "%s: accepted reconfigure key", -+ ifp->name); - } - - return dhcp; - } - -@@ -2195,12 +2199,16 @@ - iface->name); - log_dhcp1(LOG_ERR, "authentication failed", - iface, dhcp, from, 0); - return; - } -- syslog(LOG_DEBUG, "%s: validated using 0x%08" PRIu32, -- iface->name, state->auth.token->secretid); -+ if (state->auth.token) -+ syslog(LOG_DEBUG, "%s: validated using 0x%08" PRIu32, -+ iface->name, state->auth.token->secretid); -+ else -+ syslog(LOG_DEBUG, "%s: accepted reconfigure key", -+ iface->name); - } else if (ifo->auth.options & DHCPCD_AUTH_REQUIRE) { - log_dhcp1(LOG_ERR, "no authentication", iface, dhcp, from, 0); - return; - } else if (ifo->auth.options & DHCPCD_AUTH_SEND) - log_dhcp1(LOG_WARNING, "no authentication", - -Index: dhcp6.c -================================================================== ---- dhcp6.c -+++ dhcp6.c -@@ -1458,18 +1458,18 @@ - { - struct dhcp6_state *state; - const struct if_options *ifo; - const struct dhcp6_option *o; - const uint8_t *p; -- int i; -+ int i, e; - uint32_t u32, renew, rebind; - uint8_t iaid[4]; - size_t ol; - struct ipv6_addr *ap, *nap; - - ifo = ifp->options; -- i = 0; -+ i = e = 0; - state = D6_STATE(ifp); - TAILQ_FOREACH(ap, &state->addrs, next) { - ap->flags |= IPV6_AF_STALE; - } - while ((o = dhcp6_findoption(ifo->ia_type, d, l))) { -@@ -1498,12 +1498,14 @@ - rebind = ntohl(u32); - p += sizeof(u32); - ol -= sizeof(u32); - } else - renew = rebind = 0; /* appease gcc */ -- if (dhcp6_checkstatusok(ifp, NULL, p, ol) == -1) -+ if (dhcp6_checkstatusok(ifp, NULL, p, ol) == -1) { -+ e = 1; - continue; -+ } - if (ifo->ia_type == D6_OPTION_IA_PD) { - if (dhcp6_findpd(ifp, iaid, p, ol) == 0) { - syslog(LOG_WARNING, - "%s: %s: DHCPv6 REPLY missing Prefix", - ifp->name, sfrom); -@@ -1542,10 +1544,12 @@ - eloop_q_timeout_delete(ap->iface->ctx->eloop, - 0, NULL, ap); - free(ap); - } - } -+ if (i == 0 && e) -+ return -1; - return i; - } - - static int - dhcp6_validatelease(struct interface *ifp, -@@ -1657,12 +1661,16 @@ - ifp->name); - syslog(LOG_ERR, "%s: authentication failed", - ifp->name); - goto ex; - } -- syslog(LOG_DEBUG, "%s: validated using 0x%08" PRIu32, -- ifp->name, state->auth.token->secretid); -+ if (state->auth.token) -+ syslog(LOG_DEBUG, "%s: validated using 0x%08" PRIu32, -+ ifp->name, state->auth.token->secretid); -+ else -+ syslog(LOG_DEBUG, "%s: accepted reconfigure key", -+ ifp->name); - } else if (ifp->options->auth.options & DHCPCD_AUTH_REQUIRE) { - syslog(LOG_ERR, "%s: authentication now required", ifp->name); - goto ex; - } - -@@ -2053,14 +2061,17 @@ - if (state == NULL || state->send == NULL) { - syslog(LOG_DEBUG, "%s: DHCPv6 reply received but not running", - ifp->name); - return; - } -+ -+ r = (struct dhcp6_message *)ctx->rcvhdr.msg_iov[0].iov_base; -+ - /* We're already bound and this message is for another machine */ - /* XXX DELEGATED? */ -- if (state->state == DH6S_BOUND || -- state->state == DH6S_INFORMED) -+ if (r->type != DHCP6_RECONFIGURE && -+ (state->state == DH6S_BOUND || state->state == DH6S_INFORMED)) - return; - - r = (struct dhcp6_message *)ctx->rcvhdr.msg_iov[0].iov_base; - if (r->type != DHCP6_RECONFIGURE && - (r->xid[0] != state->send->xid[0] || -@@ -2119,12 +2130,16 @@ - syslog(LOG_DEBUG, "dhcp_auth_validate: %m"); - syslog(LOG_ERR, "%s: authentication failed from %s", - ifp->name, ctx->sfrom); - return; - } -- syslog(LOG_DEBUG, "%s: validated using 0x%08" PRIu32, -- ifp->name, state->auth.token->secretid); -+ if (state->auth.token) -+ syslog(LOG_DEBUG, "%s: validated using 0x%08" PRIu32, -+ ifp->name, state->auth.token->secretid); -+ else -+ syslog(LOG_DEBUG, "%s: accepted reconfigure key", -+ ifp->name); - } else if (ifo->auth.options & DHCPCD_AUTH_REQUIRE) { - syslog(LOG_ERR, "%s: no authentication from %s", - ifp->name, ctx->sfrom); - return; - } else if (ifo->auth.options & DHCPCD_AUTH_SEND) -@@ -2155,11 +2170,12 @@ - * didn't get the IA's returned, so preserve them - * from our saved response */ - if (error == 1) - goto recv; - if (error == -1 || -- dhcp6_validatelease(ifp, r, len, ctx->sfrom) == -1){ -+ dhcp6_validatelease(ifp, r, len, ctx->sfrom) == -1) -+ { - dhcp6_startdiscover(ifp); - return; - } - break; - case DH6S_DISCOVER: - diff --git a/core/dhcpcd/commit_e348e99776.diff b/core/dhcpcd/commit_e348e99776.diff deleted file mode 100644 index 3f64f3a55..000000000 --- a/core/dhcpcd/commit_e348e99776.diff +++ /dev/null @@ -1,17 +0,0 @@ -Index: dhcp.c -================================================================== ---- dhcp.c -+++ dhcp.c -@@ -2701,11 +2701,10 @@ - if (state == NULL) - goto eexit; - ifp->options = calloc(1, sizeof(*ifp->options)); - if (ifp->options == NULL) - goto eexit; -- strlcpy(ifp->name, ifname, sizeof(ifp->name)); - snprintf(state->leasefile, sizeof(state->leasefile), - LEASEFILE, ifp->name); - strlcpy(ifp->options->script, SCRIPT, sizeof(ifp->options->script)); - state->new = read_lease(ifp); - if (state->new == NULL && errno == ENOENT) { - diff --git a/core/sudo/PKGBUILD b/core/sudo/PKGBUILD index 451604289..24fd68940 100644 --- a/core/sudo/PKGBUILD +++ b/core/sudo/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 205612 2014-02-09 15:37:47Z foutrelis $ +# $Id: PKGBUILD 208214 2014-03-19 11:02:09Z foutrelis $ # Maintainer: Evangelos Foutras <evangelos@foutrelis.com> # Contributor: Allan McRae <allan@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgname=sudo -_sudover=1.8.9p5 +_sudover=1.8.10p2 pkgver=${_sudover/p/.p} pkgrel=1 pkgdesc="Give certain users the ability to run some commands as root" @@ -14,10 +14,13 @@ license=('custom') groups=('base-devel') depends=('glibc' 'pam' 'libldap') backup=('etc/sudoers' 'etc/pam.d/sudo') +install=$pkgname.install source=(http://www.sudo.ws/sudo/dist/$pkgname-$_sudover.tar.gz{,.sig} + sudo.tmpfiles.conf sudo.pam) -sha256sums=('bc9d5c96de5f8b4d2b014f87a37870aef60d2891c869202454069150a21a5c21' +sha256sums=('ba6cb8db6dccdb92a96e8ae63ca65c410f8b61270b603ab9af4b1154fef379f1' 'SKIP' + '080dd97111b3149f8d140ffac68c88acd63da9eacc81fbcc7c43591be13b42fe' 'd1738818070684a5d2c9b26224906aad69a4fea77aabd960fc2675aee2df1fa2') build() { @@ -27,6 +30,8 @@ build() { --prefix=/usr \ --sbindir=/usr/bin \ --libexecdir=/usr/lib \ + --with-rundir=/run/sudo \ + --with-vardir=/var/db/sudo \ --with-logfac=auth \ --with-pam \ --with-ldap \ @@ -46,6 +51,13 @@ package() { cd "$srcdir/$pkgname-$_sudover" make DESTDIR="$pkgdir" install + # Remove /run/sudo directory from the package; we create it using tmpfiles.d + rmdir "$pkgdir/run/sudo" + rmdir "$pkgdir/run" + + install -Dm644 "$srcdir/sudo.tmpfiles.conf" \ + "$pkgdir/usr/lib/tmpfiles.d/sudo.conf" + install -Dm644 "$srcdir/sudo.pam" "$pkgdir/etc/pam.d/sudo" install -Dm644 doc/LICENSE "$pkgdir/usr/share/licenses/sudo/LICENSE" diff --git a/core/sudo/sudo.install b/core/sudo/sudo.install new file mode 100644 index 000000000..1369cc122 --- /dev/null +++ b/core/sudo/sudo.install @@ -0,0 +1,19 @@ +post_install() { + if type -P systemd-tmpfiles >/dev/null; then + systemd-tmpfiles --create sudo.conf + fi +} + +pre_upgrade() { + # Permissions of /var/db/sudo were changed from 0700 to 0711 in sudo 1.8.10 + # http://www.sudo.ws/repos/sudo/rev/5c38d77a2d0c + if (($(vercmp $2 1.8.10-1) < 0)); then + chmod 0711 var/db/sudo + fi +} + +post_upgrade() { + post_install +} + +# vim:set ts=2 sw=2 et: diff --git a/core/sudo/sudo.tmpfiles.conf b/core/sudo/sudo.tmpfiles.conf new file mode 100644 index 000000000..0bab61444 --- /dev/null +++ b/core/sudo/sudo.tmpfiles.conf @@ -0,0 +1 @@ +d /run/sudo 0711 root root - |