update to 1.8.0
fix configuration parser
This commit is contained in:
parent
9d0a0c6200
commit
567332b6f0
@ -1,9 +1,8 @@
|
||||
# $OpenBSD: Makefile,v 1.7 2014/05/30 13:22:57 giovanni Exp $
|
||||
# $OpenBSD: Makefile,v 1.8 2014/07/11 05:59:24 giovanni Exp $
|
||||
|
||||
COMMENT = postfix greylist daemon
|
||||
|
||||
DISTNAME = sqlgrey-1.7.6
|
||||
REVISION = 1
|
||||
DISTNAME = sqlgrey-1.8.0
|
||||
CATEGORIES = mail
|
||||
|
||||
HOMEPAGE = http://sqlgrey.sf.net/
|
||||
@ -13,7 +12,6 @@ MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=sqlgrey/}
|
||||
PERMIT_PACKAGE_CDROM = Yes
|
||||
|
||||
PKG_ARCH = *
|
||||
EXTRACT_SUFX = .tar.bz2
|
||||
|
||||
NO_BUILD = Yes
|
||||
NO_TEST = Yes
|
||||
|
@ -1,5 +1,2 @@
|
||||
MD5 (sqlgrey-1.7.6.tar.bz2) = Hn5ePtXwKyn3HvTibtwcNg==
|
||||
RMD160 (sqlgrey-1.7.6.tar.bz2) = HppG5CqImflCZoTdvKAc+1zJuWo=
|
||||
SHA1 (sqlgrey-1.7.6.tar.bz2) = 7PLSMbnx585ldu2VuH2TnacifSE=
|
||||
SHA256 (sqlgrey-1.7.6.tar.bz2) = SPbIVeGNOsPRmgwuzSUDlKNV0BFqzWMRh7iAy4E2RtE=
|
||||
SIZE (sqlgrey-1.7.6.tar.bz2) = 63738
|
||||
SHA256 (sqlgrey-1.8.0.tar.gz) = lOD6GRsw1nK3SOk0coynM4O/mzbksXYYsBraq6QCgOI=
|
||||
SIZE (sqlgrey-1.8.0.tar.gz) = 69476
|
||||
|
@ -1,6 +1,6 @@
|
||||
$OpenBSD: patch-Makefile,v 1.2 2014/05/30 13:22:57 giovanni Exp $
|
||||
--- Makefile.orig Sun Oct 22 17:05:57 2006
|
||||
+++ Makefile Thu May 29 00:27:00 2014
|
||||
$OpenBSD: patch-Makefile,v 1.3 2014/07/11 05:59:24 giovanni Exp $
|
||||
--- Makefile.orig Mon Feb 13 17:54:08 2012
|
||||
+++ Makefile Thu Jun 26 09:48:08 2014
|
||||
@@ -1,10 +1,10 @@
|
||||
INSTALL = install
|
||||
-ETCDIR = $(ROOTDIR)/etc
|
||||
@ -17,8 +17,8 @@ $OpenBSD: patch-Makefile,v 1.2 2014/05/30 13:22:57 giovanni Exp $
|
||||
+MANDIR = ${PREFIX}/man/man1
|
||||
|
||||
VERSION := $(shell cat VERSION)
|
||||
TBZ2 = sqlgrey-$(VERSION).tar.bz2
|
||||
@@ -38,6 +38,7 @@ use_dbi:
|
||||
|
||||
@@ -36,6 +36,7 @@ use_dbi:
|
||||
|
||||
manpage:
|
||||
perldoc -u sqlgrey | pod2man -n sqlgrey > sqlgrey.1
|
||||
@ -26,7 +26,7 @@ $OpenBSD: patch-Makefile,v 1.2 2014/05/30 13:22:57 giovanni Exp $
|
||||
|
||||
clean:
|
||||
rm -f sqlgrey.1
|
||||
@@ -45,22 +46,26 @@ clean:
|
||||
@@ -43,22 +44,26 @@ clean:
|
||||
|
||||
install: all
|
||||
$(INSTALL) -d -m 755 $(SBINDIR)
|
||||
|
@ -1,11 +1,20 @@
|
||||
$OpenBSD: patch-sqlgrey,v 1.1 2014/05/30 13:22:57 giovanni Exp $
|
||||
--- sqlgrey.orig Thu May 29 00:59:30 2014
|
||||
+++ sqlgrey Thu May 29 00:59:45 2014
|
||||
@@ -30,6 +30,7 @@ use Pod::Usage;
|
||||
$OpenBSD: patch-sqlgrey,v 1.2 2014/07/11 05:59:24 giovanni Exp $
|
||||
--- sqlgrey.orig Mon Feb 13 17:54:08 2012
|
||||
+++ sqlgrey Thu Jun 26 10:01:05 2014
|
||||
@@ -32,6 +32,7 @@ use Pod::Usage;
|
||||
use Getopt::Long 2.25 qw(:config posix_default no_ignore_case);
|
||||
use Net::Server::Multiplex;
|
||||
use DBI;
|
||||
+use DBIx::DBCluster;
|
||||
use Math::BigInt;
|
||||
|
||||
use POSIX ':sys_wait_h';
|
||||
|
||||
@@ -2475,7 +2476,7 @@ sub read_conffile($)
|
||||
s/\s+$//; # no trailing white
|
||||
next unless length; # anything left ?
|
||||
my ($var, $value) = split(/\s*=\s*/, $_, 2);
|
||||
- $dflt{$var} = $value || 1;
|
||||
+ $dflt{$var} = $value || undef;
|
||||
}
|
||||
close CONF
|
||||
or die "Couldn't close config file $config_file\n";
|
||||
|
Loading…
x
Reference in New Issue
Block a user