diff options
Diffstat (limited to 'core')
-rw-r--r-- | core/ppp/PKGBUILD | 17 | ||||
-rw-r--r-- | core/ppp/ip-down | 2 | ||||
-rw-r--r-- | core/ppp/ipv6-down | 12 | ||||
-rw-r--r-- | core/ppp/ipv6-up | 12 | ||||
-rw-r--r-- | core/ppp/ipv6-up.d.iface-config.sh | 4 | ||||
-rw-r--r-- | core/systemd/PKGBUILD | 6 | ||||
-rw-r--r-- | core/systemd/systemd.install | 5 |
7 files changed, 53 insertions, 5 deletions
diff --git a/core/ppp/PKGBUILD b/core/ppp/PKGBUILD index 8c029106a..9b392bb2e 100644 --- a/core/ppp/PKGBUILD +++ b/core/ppp/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 166496 2012-09-08 11:35:07Z thomas $ +# $Id: PKGBUILD 169337 2012-10-19 21:33:57Z thomas $ # Maintainer: Thomas Baechler <thomas@archlinux.org> pkgname=ppp pkgver=2.4.5 -pkgrel=4 +pkgrel=5 pkgdesc="A daemon which implements the Point-to-Point Protocol for dial-up networking" arch=(i686 x86_64) url="http://www.samba.org/ppp/" @@ -21,6 +21,9 @@ source=(ftp://ftp.samba.org/pub/ppp/ppp-${pkgver}.tar.gz ip-down ip-up.d.dns.sh ip-down.d.dns.sh + ipv6-up + ipv6-down + ipv6-up.d.iface-config.sh ppp.systemd) md5sums=('4621bc56167b6953ec4071043fe0ec57' '7a9259a8f038073eeea7e4552ff1849f' @@ -30,9 +33,12 @@ md5sums=('4621bc56167b6953ec4071043fe0ec57' '86cdaf133f7a79fb464f02d83afc7734' '44cc662ba9aa61dd9add3ddd4c5ded57' 'e4beb16ed600b61336d50b2bd2df7cd5' - '2fa0671f40711e69194ccf60979f8b33' + '529b924f644f80cf30d72a966abc7419' '4a074d74c29625b254a1db720cb87b99' '8d1be5af8e46393ba6eb273377831e38' + '4cbd0a9af01c27067450ec7d3f5fa673' + 'b75c2fbc4afa9f2d8108b680c88c7036' + '9dde53aa5a931ebe1c7e3469199777c5' 'fafead5c9d66d0574e6f0a2e5f4d4631') build() { @@ -70,6 +76,11 @@ package() { install -d -m755 "${pkgdir}/etc/ppp/ip-down.d" install -m755 ../ip-up.d.dns.sh "${pkgdir}/etc/ppp/ip-up.d/00-dns.sh" install -m755 ../ip-down.d.dns.sh "${pkgdir}/etc/ppp/ip-down.d/00-dns.sh" + install -D -m755 ../ipv6-up "${pkgdir}/etc/ppp/ipv6-up" + install -D -m755 ../ipv6-down "${pkgdir}/etc/ppp/ipv6-down" + install -d -m755 "${pkgdir}/etc/ppp/ipv6-up.d" + install -d -m755 "${pkgdir}/etc/ppp/ipv6-down.d" + install -m755 ../ipv6-up.d.iface-config.sh "${pkgdir}/etc/ppp/ipv6-up.d/00-iface-config.sh" install -D -m755 ../pon "${pkgdir}/usr/bin/pon" install -D -m755 ../poff "${pkgdir}/usr/bin/poff" install -D -m755 ../plog "${pkgdir}/usr/sbin/plog" diff --git a/core/ppp/ip-down b/core/ppp/ip-down index 301f3ab9b..cfd3ae093 100644 --- a/core/ppp/ip-down +++ b/core/ppp/ip-down @@ -3,7 +3,7 @@ # This script is run by pppd after the connection has ended. # -# Execute all scripts in /etc/ppp/ip-up.d/ +# Execute all scripts in /etc/ppp/ip-down.d/ for ipdown in /etc/ppp/ip-down.d/*.sh; do if [ -x $ipdown ]; then # Parameters: interface-name tty-device speed local-IP-address remote-IP-address ipparam diff --git a/core/ppp/ipv6-down b/core/ppp/ipv6-down new file mode 100644 index 000000000..d3b9e28b3 --- /dev/null +++ b/core/ppp/ipv6-down @@ -0,0 +1,12 @@ +#!/bin/sh +# +# This script is run by pppd after the connection has ended. +# + +# Execute all scripts in /etc/ppp/ipv6-down.d/ +for ipdown in /etc/ppp/ipv6-down.d/*.sh; do + if [ -x $ipdown ]; then + # Parameters: interface-name tty-device speed local-link-local-address remote-link-local-address ipparam + $ipdown "$@" + fi +done diff --git a/core/ppp/ipv6-up b/core/ppp/ipv6-up new file mode 100644 index 000000000..b294aafdc --- /dev/null +++ b/core/ppp/ipv6-up @@ -0,0 +1,12 @@ +#!/bin/sh +# +# This script is run by pppd when there's a successful ppp connection. +# + +# Execute all scripts in /etc/ppp/ipv6-up.d/ +for ipup in /etc/ppp/ipv6-up.d/*.sh; do + if [ -x $ipup ]; then + # Parameters: interface-name tty-device speed local-link-local-address remote-link-local-address ipparam + $ipup "$@" + fi +done diff --git a/core/ppp/ipv6-up.d.iface-config.sh b/core/ppp/ipv6-up.d.iface-config.sh new file mode 100644 index 000000000..b23d6f61d --- /dev/null +++ b/core/ppp/ipv6-up.d.iface-config.sh @@ -0,0 +1,4 @@ +#!/bin/sh + +echo 0 > /proc/sys/net/ipv6/conf/$1/use_tempaddr +echo 2 > /proc/sys/net/ipv6/conf/$1/accept_ra diff --git a/core/systemd/PKGBUILD b/core/systemd/PKGBUILD index f6660eec5..073d99b15 100644 --- a/core/systemd/PKGBUILD +++ b/core/systemd/PKGBUILD @@ -4,7 +4,7 @@ pkgbase=systemd pkgname=('systemd' 'systemd-sysvcompat') pkgver=194 -pkgrel=3 +pkgrel=4 arch=('i686' 'x86_64') url="http://www.freedesktop.org/wiki/Software/systemd" license=('GPL2' 'LGPL2.1' 'MIT') @@ -61,6 +61,7 @@ package_systemd() { replaces=('libsystemd' 'systemd-tools' 'udev') conflicts=('libsystemd' 'systemd-tools' 'udev') optdepends=('initscripts: legacy support for /etc/rc.conf' + 'python: systemd library bindings' 'python2-cairo: systemd-analyze' 'python2-dbus: systemd-analyze' 'systemd-sysvcompat: symlink package to provide sysvinit binaries' @@ -131,6 +132,9 @@ package_systemd() { install -dm755 "$srcdir"/_sysvcompat/usr/share/man/man8/ mv "$pkgdir"/usr/share/man/man8/{telinit,halt,reboot,poweroff,runlevel,shutdown}.8 \ "$srcdir"/_sysvcompat/usr/share/man/man8 + + # create /var/log/journal. users can control the actual log destination via journald.conf + install -dm755 "$pkgdir/var/log/journal" } package_systemd-sysvcompat() { diff --git a/core/systemd/systemd.install b/core/systemd/systemd.install index 784926e17..fa3e8f29a 100644 --- a/core/systemd/systemd.install +++ b/core/systemd/systemd.install @@ -24,6 +24,11 @@ post_upgrade() { # horrific happens, so just mask the error. systemctl -q enable getty@.service || true fi + + if [ "$(vercmp 194-4 "$2")" -eq 1 ]; then + printf '==> journald now writes to /var/log/journal by default. This can be\n' + printf ' controlled with the Storage setting in /etc/systemd/journald.conf\n' + fi } # vim:set ts=2 sw=2 et: |