[milter-regex/el6] Update to 2.0

Paul Howarth pghmcfc at fedoraproject.org
Mon Mar 2 20:21:54 UTC 2015


commit 53aa883a4b8b89d35528f41fc198992a2897c8ad
Author: Paul Howarth <paul at city-fan.org>
Date:   Mon Nov 25 12:18:56 2013 +0000

    Update to 2.0
    
    - New upstream release 2.0
      - Add -l option to specify maximum log level
    - Drop upstreamed cleanup and starttls patches
    - Add patch to fix declaration of yyparse()

 milter-regex-1.9-cleanup.patch  | 91 -----------------------------------------
 milter-regex-1.9-starttls.patch | 18 --------
 milter-regex-2.0-yyparse.patch  | 11 +++++
 milter-regex.spec               | 20 +++++----
 sources                         |  2 +-
 5 files changed, 23 insertions(+), 119 deletions(-)
---
diff --git a/milter-regex-2.0-yyparse.patch b/milter-regex-2.0-yyparse.patch
new file mode 100644
index 0000000..86094f6
--- /dev/null
+++ b/milter-regex-2.0-yyparse.patch
@@ -0,0 +1,11 @@
+--- parse.y
++++ parse.y
+@@ -44,7 +44,7 @@ static const char rcsid[] = "$Id: parse.
+ #include "eval.h"
+ 
+ int			 yyerror(const char *, ...);
+-static int		 yyparse(void);
++extern int		 yyparse(void);
+ static int		 define_macro(const char *, struct expr *);
+ static struct expr	*find_macro(const char *);
+ 
diff --git a/milter-regex.spec b/milter-regex.spec
index 91f3b6d..3de54e2 100644
--- a/milter-regex.spec
+++ b/milter-regex.spec
@@ -1,6 +1,6 @@
 Name:		milter-regex
-Version:	1.9
-Release:	3%{?dist}
+Version:	2.0
+Release:	1%{?dist}
 Summary:	Milter plug-in for regular expression filtering
 Group:		System Environment/Daemons
 License:	BSD
@@ -9,8 +9,7 @@ Source0:	http://www.benzedrine.cx/milter-regex-%{version}.tar.gz
 Source1:	milter-regex-initscript
 Source2:	milter-regex-options
 Source3:	milter-regex.conf
-Patch0:		milter-regex-1.9-cleanup.patch
-Patch1:		milter-regex-1.9-starttls.patch
+Patch0:		milter-regex-2.0-yyparse.patch
 BuildRequires:	sendmail-devel >= 8.13, byacc, groff
 
 %description
@@ -20,11 +19,8 @@ emails using regular expressions.
 %prep
 %setup -q
 
-# Get rid of compiler warnings where possible
-%patch0 -p1 -b .cleanup
-
-# Add support for STARTTLS macro checking (#840665)
-%patch1 -p1 -b .starttls
+# yyparse() should be declared extern, not static
+%patch0
 
 # Customize config file location and dæmon user
 sed -i -e	's|/etc/milter-regex\.conf|%{_sysconfdir}/mail/milter-regex.conf|;
@@ -82,6 +78,12 @@ fi
 %{_mandir}/man8/milter-regex.8*
 
 %changelog
+* Mon Mar  2 2015 Paul Howarth <paul at city-fan.org> - 2.0-1
+- update to 2.0
+  - add -l option to specify maximum log level
+- drop upstreamed cleanup and starttls patches
+- add patch to fix declaration of yyparse()
+
 * Mon Mar  2 2015 Paul Howarth <paul at city-fan.org> - 1.9-3
 - add support for STARTTLS macro checking (#840665)
 
diff --git a/sources b/sources
index 4b7cbb0..c632654 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-65471e363669b237e280d53dc914ac2a  milter-regex-1.9.tar.gz
+4b7bb91560fa8d9a77d8f3d2c145ce24  milter-regex-2.0.tar.gz


More information about the scm-commits mailing list