[arch-commits] Commit in rblcheck/trunk (3 files)

[Sébastien Luttringer]

    Date: Friday, September 18, 2015 @ 03:30:37
  Author: seblu
Revision: 140635

upgpkg: rblcheck 1.5-3

- new upstream address
- update dnsbl

Modified:
  rblcheck/trunk/02-fix-configure.patch
  rblcheck/trunk/03-custom-rbl.patch
  rblcheck/trunk/PKGBUILD

------------------------+
 02-fix-configure.patch |   38 +++++++++++++++++++-------------------
 03-custom-rbl.patch    |    8 ++------
 PKGBUILD               |   20 +++++++++++---------
 3 files changed, 32 insertions(+), 34 deletions(-)

Modified: 02-fix-configure.patch
===================================================================
--- 02-fix-configure.patch	2015-09-17 23:07:13 UTC (rev 140634)
+++ 02-fix-configure.patch	2015-09-18 01:30:37 UTC (rev 140635)
@@ -1,20 +1,20 @@
---- a/configure	2005-07-01 10:50:36.000000000 +0100
-+++ b/configure	2005-07-01 10:57:05.000000000 +0100
-@@ -1529,13 +1529,12 @@
- cat > conftest.$ac_ext <<EOF
- #line 1531 "configure"
- #include "confdefs.h"
--/* Override any gcc2 internal prototype to avoid an error.  */
--/* We use char because int might match the return type of a gcc2
--    builtin and then its argument prototype would still apply.  */
--char res_query();
-+
-+/* Include <resolv.h> to get macro definition for res_query */
-+#include <resolv.h>
+# Copyright 2015 Séastien Luttringer
+--- a/configure.in	2015-09-18 02:55:59.825544232 +0200
++++ b/configure.in	2015-09-18 03:23:33.544191972 +0200
+@@ -19,15 +19,7 @@
+ dnl Checks for typedefs, structures, and compiler characteristics.
+ AC_C_CONST
  
- int main() {
--res_query()
-+res_query("",0,0,"",0)
- ; return 0; }
- EOF
- if { (eval echo configure:1542: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+-dnl Figure out where to get res_query from. First, see if it's in the
+-dnl C library (Linux, and probably a few others). Then, check libbind
+-dnl (generally, if you've installed bind 8, you're going to want to use
+-dnl the new library). Finally, check for libresolv (which should exist
+-dnl on most systems).
+-AC_CHECK_FUNC(res_query,,
+-	AC_CHECK_LIB(resolv,res_query,,
+-		AC_CHECK_LIB(bind,res_query,,
+-			AC_MSG_ERROR(cannot locate res_query function))))
++AC_CHECK_LIB(resolv, __res_query)
+ 
+ dnl All done.
+ AC_OUTPUT(Makefile docs/Makefile config/rblcheck.spec config/pkginfo)

Modified: 03-custom-rbl.patch
===================================================================
--- 03-custom-rbl.patch	2015-09-17 23:07:13 UTC (rev 140634)
+++ 03-custom-rbl.patch	2015-09-18 01:30:37 UTC (rev 140635)
@@ -1,6 +1,6 @@
 --- a/sites.h
 +++ b/sites.h
-@@ -62,3 +62,18 @@
+@@ -62,3 +62,14 @@
  /* ORDB: Open Relay DataBase
     http://www.ordb.org/ */
  /* SITE("relays.ordb.org") */
@@ -13,9 +13,5 @@
 +SITE("bl.spamcop.net");
 +SITE("psbl.surriel.com");
 +SITE("dnsbl.njabl.org");
-+SITE("dul.dnsbl.sorbs.net");
-+SITE("all.spam-rbl.fr");
-+SITE("spam.spam-rbl.fr");
-+SITE("dsl.spam-rbl.fr");
-+SITE("bogon.spam-rbl.fr");
++SITE("dnsbl.sorbs.net");
 +

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-09-17 23:07:13 UTC (rev 140634)
+++ PKGBUILD	2015-09-18 01:30:37 UTC (rev 140635)
@@ -3,26 +3,27 @@
 
 pkgname=rblcheck
 pkgver=1.5
-pkgrel=2
+pkgrel=3
 pkgdesc='Tool to query RBL servers'
 arch=('i686' 'x86_64')
-url='http://rblcheck.sourceforge.net/'
+url='https://github.com/logic/rblcheck'
 license=('GPL2')
 depends=('glibc' 'bash')
+makedepends=('git')
 backup=('etc/rblcheckrc')
-source=("http://downloads.sourceforge.net/rblcheck/$pkgname-$pkgver.tar.gz"
+source=("git+https://github.com/logic/rblcheck.git#tag=rblcheck-$pkgver"
         '01-change-filename-tags-for-directories.patch'
         '02-fix-configure.patch'
         '03-custom-rbl.patch'
         '04-fix-missing-include.patch')
-md5sums=('fb7ee9adc0e09eee9dda195f9b9e7ca4'
+md5sums=('SKIP'
          '9e8ed44f4bc6abf235a14065b6aa373c'
-         '2db00ffd71e17753e89c0968c76d5871'
-         'f9ff2de975584f71f7794550691a0272'
+         'ef71fccbf229eafc7ff6df57de2511ea'
+         'a9bc3e8a9b13adc20dfc40052a3ab367'
          'ccc95fb87a4192d4a0ddb36cd5df0a36')
 
 prepare() {
-  cd $pkgname-$pkgver
+  cd $pkgname
   for p in "$srcdir"/*.patch; do
     msg2 "Apply patch ${p##*/}"
     patch -p 1 -i "$p"
@@ -30,13 +31,14 @@
 }
 
 build() {
-  cd $pkgname-$pkgver
+  cd $pkgname
+  ./bootstrap
   ./configure --prefix=/usr --sysconfdir=/etc
   make
 }
 
 package() {
-  cd $pkgname-$pkgver
+  cd $pkgname
   make DESTDIR="$pkgdir" install
   install -Dm 644 /dev/null "$pkgdir/etc/rblcheckrc"
 }