diff options
| author | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-10-17 10:20:19 -0300 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-10-17 10:20:19 -0300 |
| commit | 66e4c91d4531eef5adcd9dbe4a71e63c9b72cd7e (patch) | |
| tree | 19e3e26a15f15fc8405ba2016fe9d4cc19919833 /extra/dhcp | |
| parent | c646bdd97c63b2d81bc27060203fabfebabda716 (diff) | |
| parent | c84b2cd310f86dc50c4f52a5907cb17652e8c87c (diff) | |
Merged upstream, mesa needs revision
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community-staging/gigi/PKGBUILD
community-staging/lxdm/PKGBUILD
community-staging/lxdm/lxdm-pam
community-staging/lxdm/lxdm.install
community-staging/lxdm/service
community-testing/gigi/PKGBUILD
community/calf/PKGBUILD
community/freedroidrpg/PKGBUILD
community/gmic/PKGBUILD
community/gnash/PKGBUILD
community/prboom/PKGBUILD
community/scorched3d/PKGBUILD
community/tmux/PKGBUILD
community/torcs/PKGBUILD
core/curl/PKGBUILD
core/systemd/PKGBUILD
core/sysvinit/PKGBUILD
extra/akonadi/PKGBUILD
extra/bzflag/PKGBUILD
extra/dhcp/PKGBUILD
extra/ftgl/PKGBUILD
extra/gcin/PKGBUILD
extra/imagemagick/PKGBUILD
extra/mesa/PKGBUILD
extra/python-telepathy/PKGBUILD
extra/qtiplot/PKGBUILD
extra/ruby/PKGBUILD
extra/wireshark/PKGBUILD
extra/xfce4-xkb-plugin/PKGBUILD
extra/xine-lib/PKGBUILD
extra/xorg-server/PKGBUILD
gnome-unstable/at-spi2-atk/PKGBUILD
gnome-unstable/at-spi2-core/PKGBUILD
gnome-unstable/baobab/PKGBUILD
gnome-unstable/epiphany/PKGBUILD
gnome-unstable/gdm/PKGBUILD
gnome-unstable/glib2/PKGBUILD
gnome-unstable/gnome-games/PKGBUILD
gnome-unstable/gnome-screensaver/PKGBUILD
gnome-unstable/gnome-session/PKGBUILD
gnome-unstable/gtk3/PKGBUILD
gnome-unstable/libpeas/PKGBUILD
gnome-unstable/libsoup/PKGBUILD
gnome-unstable/mutter/PKGBUILD
gnome-unstable/networkmanager/PKGBUILD
multilib/lib32-glew/PKGBUILD
multilib/lib32-gnutls/PKGBUILD
multilib/lib32-mesa/PKGBUILD
multilib/lib32-sqlite/PKGBUILD
multilib/wine/PKGBUILD
multilib/wine_gecko/PKGBUILD
staging/calligra/PKGBUILD
staging/inkscape/PKGBUILD
staging/kdebase-workspace/PKGBUILD
staging/kdebase-workspace/kde-np.pam
staging/kdebase-workspace/kde.pam
staging/kdebase-workspace/kdm.service
staging/libreoffice/PKGBUILD
staging/libreoffice/libreoffice-common.csh
staging/libreoffice/libreoffice-common.sh
staging/poppler/PKGBUILD
testing/dbus-python/PKGBUILD
testing/e2fsprogs/PKGBUILD
testing/iproute2/PKGBUILD
testing/iptables/PKGBUILD
testing/kdebase-workspace/PKGBUILD
testing/kdebase-workspace/kde-np.pam
testing/kdebase-workspace/kde.pam
testing/kdebindings-python/PKGBUILD
testing/lvm2/PKGBUILD
testing/lvm2/lvm-on-crypt.service
testing/lvm2/lvm.service
testing/miro/PKGBUILD
testing/postgresql/PKGBUILD
testing/postgresql/postgresql.install
testing/postgresql/postgresql.service
testing/ppp/PKGBUILD
testing/ppp/ip-down
testing/pyqt/PKGBUILD
testing/qscintilla/PKGBUILD
testing/sip/PKGBUILD
testing/systemd/PKGBUILD
testing/systemd/systemd.install
testing/util-linux/PKGBUILD
testing/wpa_supplicant/PKGBUILD
testing/wpa_supplicant/config
testing/xf86-video-intel/PKGBUILD
Diffstat (limited to 'extra/dhcp')
| -rw-r--r-- | extra/dhcp/PKGBUILD | 8 | ||||
| -rw-r--r-- | extra/dhcp/dhcpd4.service | 1 | ||||
| -rw-r--r-- | extra/dhcp/dhcpd6.service | 1 |
3 files changed, 4 insertions, 6 deletions
diff --git a/extra/dhcp/PKGBUILD b/extra/dhcp/PKGBUILD index 7ab36a123..fbcdc06b6 100644 --- a/extra/dhcp/PKGBUILD +++ b/extra/dhcp/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 165619 2012-08-27 12:24:33Z heftig $ +# $Id: PKGBUILD 168635 2012-10-13 17:04:17Z thomas $ # Maintainer: Daniel Isenmann <daniel @archlinux.org> pkgbase=dhcp @@ -8,7 +8,7 @@ pkgname=('dhcp' 'dhclient') pkgver=4.2.4.1 _pkgver=4.2.4-P1 -pkgrel=2 +pkgrel=3 arch=('i686' 'x86_64' 'mips64el') license=('custom:isc-dhcp') url="https://www.isc.org/software/dhcp" @@ -22,8 +22,8 @@ md5sums=('0ca7181024651f6323951d5498c8020b' 'c49b1497837ba56c54e401a66e1bab9b' '12c2f3ae47ed23eb698eb7f1bfd80f20' '8f357e46e1efcbb746f38737a3f977a2' - '1076444f22e13eb5f6bff7821fd0f446' - '9310f2d8b1d7e97ace06d68cb41d9998' + '439ee2f145a1e86dd644cb94a854f8e7' + '588aa85b6fe228c45623185a58d11992' 'fd64aeb4f399dcc41ea43089a3811094' '541b415a25a169eaf64b681405f79a80') diff --git a/extra/dhcp/dhcpd4.service b/extra/dhcp/dhcpd4.service index 2ef4a9f26..89f7d2500 100644 --- a/extra/dhcp/dhcpd4.service +++ b/extra/dhcp/dhcpd4.service @@ -6,7 +6,6 @@ After=network.target Type=forking PIDFile=/run/dhcpd4.pid ExecStart=/usr/sbin/dhcpd -4 -q -pf /run/dhcpd4.pid -ExecReload=/bin/kill -TERM $MAINPID KillSignal=SIGINT [Install] diff --git a/extra/dhcp/dhcpd6.service b/extra/dhcp/dhcpd6.service index eb3b337c6..95d3dc45f 100644 --- a/extra/dhcp/dhcpd6.service +++ b/extra/dhcp/dhcpd6.service @@ -6,7 +6,6 @@ After=network.target Type=forking PIDFile=/run/dhcpd6.pid ExecStart=/usr/sbin/dhcpd -6 -q -pf /run/dhcpd6.pid -ExecReload=/bin/kill -TERM $MAINPID KillSignal=SIGINT [Install] |