CVS commit: [pkgsrc-2019Q1] pkgsrc/mail/fml4

["S.P.Zeidler" <spz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   spz
Date:           Sun May 12 20:47:11 UTC 2019

Modified Files:
        pkgsrc/mail/fml4 [pkgsrc-2019Q1]: Makefile distinfo
Added Files:
        pkgsrc/mail/fml4/patches [pkgsrc-2019Q1]:
            patch-module_fml-devel_FML_Restriction_Base.pm

Log Message:
Pullup ticket #5960 - requested by taca
mail/fml4: security update

Revisions pulled up:
- mail/fml4/Makefile                                            1.19
- mail/fml4/distinfo                                            1.9
- mail/fml4/patches/patch-module_fml-devel_FML_Restriction_Base.pm 1.1

-------------------------------------------------------------------
   Module Name: pkgsrc
   Committed By:        taca
   Date:                Tue Apr 30 03:38:59 UTC 2019

   Modified Files:
        pkgsrc/mail/fml4: Makefile distinfo
   Added Files:
        pkgsrc/mail/fml4/patches:
            patch-module_fml-devel_FML_Restriction_Base.pm

   Log Message:
   mail/fml4: fix critical runtime problem

   Fix critical runtime problem.

   Bump PKGREVISION.

   To generate a diff of this commit:
   cvs rdiff -u -r1.18 -r1.19 pkgsrc/mail/fml4/Makefile
   cvs rdiff -u -r1.8 -r1.9 pkgsrc/mail/fml4/distinfo
   cvs rdiff -u -r0 -r1.1 \
       pkgsrc/mail/fml4/patches/patch-module_fml-devel_FML_Restriction_Base.pm


To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.18.6.1 pkgsrc/mail/fml4/Makefile
cvs rdiff -u -r1.8 -r1.8.24.1 pkgsrc/mail/fml4/distinfo
cvs rdiff -u -r0 -r1.1.2.2 \
    pkgsrc/mail/fml4/patches/patch-module_fml-devel_FML_Restriction_Base.pm

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/mail/fml4/Makefile
diff -u pkgsrc/mail/fml4/Makefile:1.18 pkgsrc/mail/fml4/Makefile:1.18.6.1
--- pkgsrc/mail/fml4/Makefile:1.18      Wed Aug 22 09:45:25 2018
+++ pkgsrc/mail/fml4/Makefile   Sun May 12 20:47:11 2019
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.18 2018/08/22 09:45:25 wiz Exp $
+# $NetBSD: Makefile,v 1.18.6.1 2019/05/12 20:47:11 spz Exp $
 #
 
 DISTNAME=      fml-4.0-stable-20040215
 PKGNAME=       fml4-4.0.3.20040215
-PKGREVISION=   13
+PKGREVISION=   14
 CATEGORIES=    mail
 MASTER_SITES=  ftp://ftp.fml.org/pub/fml/stable/
 

Index: pkgsrc/mail/fml4/distinfo
diff -u pkgsrc/mail/fml4/distinfo:1.8 pkgsrc/mail/fml4/distinfo:1.8.24.1
--- pkgsrc/mail/fml4/distinfo:1.8       Mon Sep 12 15:46:07 2016
+++ pkgsrc/mail/fml4/distinfo   Sun May 12 20:47:11 2019
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.8 2016/09/12 15:46:07 taca Exp $
+$NetBSD: distinfo,v 1.8.24.1 2019/05/12 20:47:11 spz Exp $
 
 SHA1 (fml-4.0-stable-20040215.tar.gz) = b7f958deacc50a0173928b7c43df52b5869d9491
 RMD160 (fml-4.0-stable-20040215.tar.gz) = 40eb43d2631a5e6d6769b8cfdf35e4a980ff0391
@@ -11,5 +11,6 @@ SHA1 (patch-ad) = 17e5d1d97e5a085b8b5da6
 SHA1 (patch-ae) = 467a8bacfb0a6d41ceb1d8f52fc4bfc0ae2fc565
 SHA1 (patch-af) = 9e7fa7c70b4f3353a5c33d0ded2eeae86d9a5c65
 SHA1 (patch-ag) = 00c20b043e74e9107a204ee94abef9de870d2b97
+SHA1 (patch-module_fml-devel_FML_Restriction_Base.pm) = ce5700c3fd36112b9b7a63264290a7d98b8e3820
 SHA1 (patch-src_jcode.pl) = d850d762e7af4a2f9086f745d20c24ab427ed611
 SHA1 (patch-src_libkernsubr.pl) = c9d4e57b12fddb3045f47b27926c67cfe32c0d44

Added files:

Index: pkgsrc/mail/fml4/patches/patch-module_fml-devel_FML_Restriction_Base.pm
diff -u /dev/null pkgsrc/mail/fml4/patches/patch-module_fml-devel_FML_Restriction_Base.pm:1.1.2.2
--- /dev/null   Sun May 12 20:47:11 2019
+++ pkgsrc/mail/fml4/patches/patch-module_fml-devel_FML_Restriction_Base.pm     Sun May 12 20:47:11 2019
@@ -0,0 +1,14 @@
+$NetBSD: patch-module_fml-devel_FML_Restriction_Base.pm,v 1.1.2.2 2019/05/12 20:47:11 spz Exp $
+
+* Avoid function redefinition.
+
+--- module/fml-devel/FML/Restriction/Base.pm.orig      2003-12-06 15:41:33.000000000 +0000
++++ module/fml-devel/FML/Restriction/Base.pm
+@@ -10,7 +10,6 @@ package FML::Restriction::Base;
+ 
+ use vars qw($debug @ISA @EXPORT @EXPORT_OK);
+ use strict;
+-use Carp;
+ 
+ =head1 NAME
+