[arch-commits] Commit in dnsmasq/repos (4 files)

[Paul Mattal]

    Date: Friday, December 4, 2009 @ 00:27:42
  Author: paul
Revision: 60363

Merged revisions 60361 via svnmerge from 
svn+ssh://gerolde.archlinux.org/srv/svn-packages/dnsmasq/trunk

........
  r60361 | paul | 2009-12-04 00:09:08 -0500 (Fri, 04 Dec 2009) | 2 lines
  
  upgpkg: dnsmasq 2.51-1
      upstream update to 2.51, remove obsolete SECURITY_CAPABILITY stuff
........

Modified:
  dnsmasq/repos/extra-x86_64/	(properties)
  dnsmasq/repos/extra-x86_64/PKGBUILD
Deleted:
  dnsmasq/repos/extra-x86_64/dnsmasq-capability-config.patch
  dnsmasq/repos/extra-x86_64/dnsmasq.install

---------------------------------+
 PKGBUILD                        |   14 +++++---------
 dnsmasq-capability-config.patch |   14 --------------
 dnsmasq.install                 |   28 ----------------------------
 3 files changed, 5 insertions(+), 51 deletions(-)


Property changes on: dnsmasq/repos/extra-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
   - /dnsmasq/trunk:1-50878
   + /dnsmasq/trunk:1-60362

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2009-12-04 05:09:27 UTC (rev 60362)
+++ extra-x86_64/PKGBUILD	2009-12-04 05:27:42 UTC (rev 60363)
@@ -3,7 +3,7 @@
 # Contributor: Tom Newsom <Jeepster at gmx.co.uk>
 
 pkgname=dnsmasq
-pkgver=2.50
+pkgver=2.51
 pkgrel=1
 pkgdesc="Lightweight, easy to configure DNS forwarder and DHCP server"
 url="http://www.thekelleys.org.uk/dnsmasq/doc.html"
@@ -12,18 +12,14 @@
 depends=('glibc' 'bash')
 makedepends=('libcap>=2.16')
 backup=('etc/dnsmasq.conf')
-install=$pkgname.install
-source=("http://www.thekelleys.org.uk/$pkgname/$pkgname-$pkgver.tar.gz" \
-        'rc.dnsmasq' "$pkgname-capability-config.patch")
-md5sums=('f7b1e17c590e493039537434c57c9de7' 'e956eee1ec24212a3254d2b168187495'\
-         'ef61cd6c3ce1fd0767a98b02975c9c9c')
+install=
+source=("http://www.thekelleys.org.uk/$pkgname/$pkgname-$pkgver.tar.gz" 
+        'rc.dnsmasq')
+md5sums=('97465261a6de5258a3c3edfe51ca16a4' 'e956eee1ec24212a3254d2b168187495')
 
 build() {
   cd $srcdir/$pkgname-$pkgver
 
-  # Patch to add a Note about Capability Module in the Config File
-  patch -Np0 -i ../$pkgname-capability-config.patch || return 1
-
   # Build
   make || return 1
 

Deleted: extra-x86_64/dnsmasq-capability-config.patch
===================================================================
--- extra-x86_64/dnsmasq-capability-config.patch	2009-12-04 05:09:27 UTC (rev 60362)
+++ extra-x86_64/dnsmasq-capability-config.patch	2009-12-04 05:27:42 UTC (rev 60363)
@@ -1,14 +0,0 @@
-diff -urN dnsmasq.conf.example dnsmasq.conf.example.fixed
---- dnsmasq.conf.example	2006-10-18 16:24:50.000000000 -0400
-+++ dnsmasq.conf.example.fixed	2006-11-20 22:07:12.000000000 -0500
-@@ -58,7 +58,9 @@
- #address=/doubleclick.net/127.0.0.1
- 
- # If you want dnsmasq to change uid and gid to something other
--# than the default, edit the following lines.
-+# than root, you will need to have CONFIG_SECURITY_CAPABILITIES 
-+# enabled in your kernel. The default uid and gid of nobody will 
-+# be used if capability is available and this is not set.
- #user=
- #group=
- 

Deleted: extra-x86_64/dnsmasq.install
===================================================================
--- extra-x86_64/dnsmasq.install	2009-12-04 05:09:27 UTC (rev 60362)
+++ extra-x86_64/dnsmasq.install	2009-12-04 05:27:42 UTC (rev 60363)
@@ -1,28 +0,0 @@
-# arg 1: the new package version
-post_install() {
-	echo "=========================================================="
-	echo "| IMPORTANT: Unless you want to run dnsmasq as root, you |"
-	echo "|     must either enable CONFIG_SECURITY_CAPABILITIES in |"
-	echo "|     your kernel or add capability to the MODULES array |"
-	echo "|     in /etc/rc.conf.                                   |" 
-	echo "| For more details on configuring dnsmasq, visit:        |"
-	echo "|     http://www.thekelleys.org.uk/dnsmasq/doc.html      |"
-	echo "=========================================================="
-	/bin/true
-}
-
-# arg 1: the new package version
-# arg 2: the old package version
-post_upgrade() {
-	/bin/true
-}
-
-# arg 1: the old package version
-pre_remove() {
-	/bin/true
-}
-
-op=$1
-shift
-
-$op $*