[libsendmail-milter-perl] 03/04: Modernized package
Hilko Bengen
bengen at moszumanska.debian.org
Sun Sep 27 18:32:51 UTC 2015
This is an automated email from the git hooks/post-receive script.
bengen pushed a commit to branch master
in repository libsendmail-milter-perl.
commit 1670d4ac65c9e5a51229fc2e6fc358c540d577e5
Author: Hilko Bengen <bengen at debian.org>
Date: Sun Sep 27 19:38:36 2015 +0200
Modernized package
- 3.0 (quilt)
- Bumped Standards-Version
- Bumped debian/compat (Closes: #800228)
- Added machine-readable debian/copyright file
---
Makefile.PL | 33 ++--
debian/changelog | 2 +-
debian/compat | 1 +
debian/control | 8 +-
debian/copyright | 207 +++++++++++----------
...1-Use-system-provided-library-and-headers.patch | 61 ++++++
debian/patches/series | 1 +
debian/rules | 91 +--------
debian/source/format | 1 +
9 files changed, 197 insertions(+), 208 deletions(-)
diff --git a/Makefile.PL b/Makefile.PL
index fc70378..bd827fb 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -5,13 +5,13 @@ use strict;
use ExtUtils::MakeMaker;
use Config;
-# if ((not $ARGV[0]) or (not $ARGV[1]))
-# {
-# print "Usage: perl Makefile.PL <path-to-sendmail-source> <path-to-sendmail-obj.dir>\n";
-# print "(e.g. 'perl Makefile.PL ../sendmail ../sendmail/obj.FreeBSD.4.0-RELEASE.i386')\n";
-# print "\n";
-# exit;
-# }
+if ((not $ARGV[0]) or (not $ARGV[1]))
+{
+ print "Usage: perl Makefile.PL <path-to-sendmail-source> <path-to-sendmail-obj.dir>\n";
+ print "(e.g. 'perl Makefile.PL ../sendmail ../sendmail/obj.FreeBSD.4.0-RELEASE.i386')\n";
+ print "\n";
+ exit;
+}
if (not $Config{usethreads})
{
@@ -24,16 +24,11 @@ if (not $Config{usethreads})
my $SENDMAIL_PATH = MM->canonpath($ARGV[0]);
my $SENDMAIL_OBJ_PATH = MM->canonpath($ARGV[1]);
-# my $MILTER_LIB = MM->catdir($SENDMAIL_OBJ_PATH, "libmilter");
-my $MILTER_LIB = '/usr/lib/libmilter';
-# my $SMUTIL_LIB = MM->catdir($SENDMAIL_OBJ_PATH, "libsmutil");
-my $SMUTIL_LIB = '/usr/lib/libmilter';
-# my $SM_LIB = MM->catdir($SENDMAIL_OBJ_PATH, "libsm");
-my $SM_LIB = '/usr/lib/libmilter';
-# my $MILTER_INCLUDE = MM->catdir($SENDMAIL_PATH, "include");
-my $MILTER_INCLUDE= '/usr/include/libmilter';
-# my $SENDMAIL_INCLUDE = MM->catdir($SENDMAIL_PATH, "sendmail");
-my $SENDMAIL_INCLUDE = '';
+my $MILTER_LIB = MM->catdir($SENDMAIL_OBJ_PATH, "libmilter");
+my $SMUTIL_LIB = MM->catdir($SENDMAIL_OBJ_PATH, "libsmutil");
+my $SM_LIB = MM->catdir($SENDMAIL_OBJ_PATH, "libsm");
+my $MILTER_INCLUDE = MM->catdir($SENDMAIL_PATH, "include");
+my $SENDMAIL_INCLUDE = MM->catdir($SENDMAIL_PATH, "sendmail");
sub milter_configure
{
@@ -42,8 +37,7 @@ sub milter_configure
my $ccflags;
# Standard milter libraries
-# $libs = "-L$MILTER_LIB -L$SMUTIL_LIB -L$SM_LIB -lmilter -lsmutil -lsm";
- $libs = "-L/usr/lib/libmilter -lmilter -lsmutil -lsm";
+ $libs = "-L$MILTER_LIB -L$SMUTIL_LIB -L$SM_LIB -lmilter -lsmutil -lsm";
# POSIX threads support.
if ($Config{libs} =~ /-lpthread/)
@@ -87,6 +81,7 @@ WriteMakefile(
'VERSION_FROM' => 'Milter.pm',
'CONFIGURE' => \&milter_configure,
'OBJECT' => '$(BASEEXT)$(OBJ_EXT) intpools$(OBJ_EXT) callbacks$(OBJ_EXT)',
+ 'DEFINE' => '',
'INC' => "-I$SENDMAIL_INCLUDE -I$MILTER_INCLUDE",
);
diff --git a/debian/changelog b/debian/changelog
index 593a7fe..7010e06 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -40,7 +40,7 @@ libsendmail-milter-perl (0.18-2) unstable; urgency=low
* Don't build on alpha, hppa, ia64. For now. (Closes: #195857)
- -- Hilko Bengen <bengen at debian,org> Thu, 9 Oct 2003 06:58:27 +0200
+ -- Hilko Bengen <bengen at debian.org> Thu, 9 Oct 2003 06:58:27 +0200
libsendmail-milter-perl (0.18-1) unstable; urgency=low
diff --git a/debian/compat b/debian/compat
new file mode 100644
index 0000000..ec63514
--- /dev/null
+++ b/debian/compat
@@ -0,0 +1 @@
+9
diff --git a/debian/control b/debian/control
index 2e08fce..cf1fe38 100644
--- a/debian/control
+++ b/debian/control
@@ -1,18 +1,18 @@
Source: libsendmail-milter-perl
Section: perl
Priority: optional
-Build-Depends: debhelper (>= 3.0.5), perl (>= 5.8.0-7), libmilter-dev (>= 8.12.10-5)
-Standards-Version: 3.6.1.0
+Build-Depends: debhelper (>= 9~), perl (>= 5.8.0-7), libmilter-dev (>= 8.12.10-5)
Maintainer: Debian Perl Group <pkg-perl-maintainers at lists.alioth.debian.org>
Uploaders: Hilko Bengen <bengen at debian.org>
+Standards-Version: 3.9.6
Vcs-Git: git://anonscm.debian.org/pkg-perl/packages/libsendmail-milter-perl.git
Vcs-Browser: https://anonscm.debian.org/cgit/pkg-perl/packages/libsendmail-milter-perl.git
Homepage: http://search.cpan.org/dist/Sendmail-Milter/
Package: libsendmail-milter-perl
Architecture: any
-Depends: ${perl:Depends}, ${shlibs:Depends}
-Description: Interface to Sendmail's Mail Filter API
+Depends: ${perl:Depends}, ${shlibs:Depends}, ${misc:Depends},
+Description: Interface to Sendmail's Mail Filter API
Sendmail::Milter is a Perl extension to sendmail's Mail Filter API
(Milter).
.
diff --git a/debian/copyright b/debian/copyright
index c699673..888d12d 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,95 +1,112 @@
-This is the Debian package for the Sendmail::Milter module.
-
-It was created by Hilko Bengen <bengen at debian.org> using
-dh-make-perl.
-
-The upstream author is Charles Ying <cying at cpan.org>.
-
-Sendmail::Milter is licensed under the same terms as sendmail itself.
-The Sendmail license is included below.
-
-The interpreter pools portion (found in the intpools.c, intpools.h,
-and test.pl files) of this code is also available under the same terms
-as perl itself. See /usr/share/doc/perl/copyright for details.
-
-------------------------------------------------------------------------
-
- SENDMAIL LICENSE
-
-The following license terms and conditions apply, unless a different
-license is obtained from Sendmail, Inc., 6425 Christie Ave, Fourth Floor,
-Emeryville, CA 94608, or by electronic mail at license at sendmail.com.
-
-License Terms:
-
-Use, Modification and Redistribution (including distribution of any
-modified or derived work) in source and binary forms is permitted only if
-each of the following conditions is met:
-
-1. Redistributions qualify as "freeware" or "Open Source Software" under
- one of the following terms:
-
- (a) Redistributions are made at no charge beyond the reasonable cost of
- materials and delivery.
-
- (b) Redistributions are accompanied by a copy of the Source Code or by an
- irrevocable offer to provide a copy of the Source Code for up to three
- years at the cost of materials and delivery. Such redistributions
- must allow further use, modification, and redistribution of the Source
- Code under substantially the same terms as this license. For the
- purposes of redistribution "Source Code" means the complete compilable
- and linkable source code of sendmail including all modifications.
-
-2. Redistributions of source code must retain the copyright notices as they
- appear in each source code file, these license terms, and the
- disclaimer/limitation of liability set forth as paragraph 6 below.
-
-3. Redistributions in binary form must reproduce the Copyright Notice,
- these license terms, and the disclaimer/limitation of liability set
- forth as paragraph 6 below, in the documentation and/or other materials
- provided with the distribution. For the purposes of binary distribution
- the "Copyright Notice" refers to the following language:
- "Copyright (c) 1998-2000 Sendmail, Inc. All rights reserved."
-
-4. Neither the name of Sendmail, Inc. nor the University of California nor
- the names of their contributors may be used to endorse or promote
- products derived from this software without specific prior written
- permission. The name "sendmail" is a trademark of Sendmail, Inc.
-
-5. All redistributions must comply with the conditions imposed by the
- University of California on certain embedded code, whose copyright
- notice and conditions for redistribution are as follows:
-
- (a) Copyright (c) 1988, 1993 The Regents of the University of
- California. All rights reserved.
-
- (b) Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions
- are met:
-
- (i) Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
-
- (ii) Redistributions in binary form must reproduce the above
- copyright notice, this list of conditions and the following
- disclaimer in the documentation and/or other materials provided
- with the distribution.
-
- (iii) Neither the name of the University nor the names of its
- contributors may be used to endorse or promote products derived
- from this software without specific prior written permission.
-
-6. Disclaimer/Limitation of Liability: THIS SOFTWARE IS PROVIDED BY
- SENDMAIL, INC. AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED
- WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN
- NO EVENT SHALL SENDMAIL, INC., THE REGENTS OF THE UNIVERSITY OF
- CALIFORNIA OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
- INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
- USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-$Revision: 1.3 $, Last updated $Date: 2003/11/16 17:13:29 $
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: Sendmail-Milter
+Source: http://search.cpan.org/dist/Sendmail-Milter/
+
+Files: *
+Copyright: James Macfarlane, <jmacfarla at cpan.org>
+License: other-Sendmail
+
+Files: intpools.c intpools.h
+Copyright: James Macfarlane, <jmacfarla at cpan.org>
+License: other-Sendmail or Artistic or GPL-1+
+
+Files: intpools.c intpools.h debian/*
+Copyright: 2003, Hilko Bengen <bengen at debian.org>
+License: Artistic or GPL-1+
+
+License: other-Sendmail
+ SENDMAIL LICENSE
+ .
+ The following license terms and conditions apply, unless a redistribution
+ agreement or other license is obtained from Proofpoint, Inc., 892
+ Ross Street, Sunnyvale, CA, 94089, USA, or by electronic mail at
+ sendmail-license at proofpoint.com.
+ .
+ License Terms:
+ .
+ Use, Modification and Redistribution (including distribution of any
+ modified or derived work) in source and binary forms is permitted only if
+ each of the following conditions is met:
+ .
+ 1. Redistributions qualify as "freeware" or "Open Source Software" under
+ one of the following terms:
+ .
+ (a) Redistributions are made at no charge beyond the reasonable cost of
+ materials and delivery.
+ .
+ (b) Redistributions are accompanied by a copy of the Source Code or by an
+ irrevocable offer to provide a copy of the Source Code for up to three
+ years at the cost of materials and delivery. Such redistributions
+ must allow further use, modification, and redistribution of the Source
+ Code under substantially the same terms as this license. For the
+ purposes of redistribution "Source Code" means the complete compilable
+ and linkable source code of sendmail and associated libraries and
+ utilities in the sendmail distribution including all modifications.
+ .
+ 2. Redistributions of Source Code must retain the copyright notices as they
+ appear in each Source Code file, these license terms, and the
+ disclaimer/limitation of liability set forth as paragraph 6 below.
+ .
+ 3. Redistributions in binary form must reproduce the Copyright Notice,
+ these license terms, and the disclaimer/limitation of liability set
+ forth as paragraph 6 below, in the documentation and/or other materials
+ provided with the distribution. For the purposes of binary distribution
+ the "Copyright Notice" refers to the following language:
+ "Copyright (c) 1998-2013 Proofpoint, Inc. All rights reserved."
+ .
+ 4. Neither the name of Proofpoint, Inc. nor the University of California nor
+ names of their contributors may be used to endorse or promote
+ products derived from this software without specific prior written
+ permission. The name "sendmail" is a trademark of Proofpoint, Inc.
+ .
+ 5. All redistributions must comply with the conditions imposed by the
+ University of California on certain embedded code, which copyright
+ Notice and conditions for redistribution are as follows:
+ .
+ (a) Copyright (c) 1988, 1993 The Regents of the University of
+ California. All rights reserved.
+ .
+ (b) Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+ .
+ (i) Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+ .
+ (ii) Redistributions in binary form must reproduce the above
+ copyright notice, this list of conditions and the following
+ disclaimer in the documentation and/or other materials provided
+ with the distribution.
+ .
+ (iii) Neither the name of the University nor the names of its
+ contributors may be used to endorse or promote products derived
+ from this software without specific prior written permission.
+ .
+ 6. Disclaimer/Limitation of Liability: THIS SOFTWARE IS PROVIDED BY
+ SENDMAIL, INC. AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED
+ WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN
+ NO EVENT SHALL SENDMAIL, INC., THE REGENTS OF THE UNIVERSITY OF
+ CALIFORNIA OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+ USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ .
+ $Revision: 8.22 $, Last updated $Date: 2013/11/23 04:37:36 $, Document 139848.1
+
+License: Artistic
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the Artistic License, which comes with Perl.
+ On Debian GNU/Linux systems, the complete text of the Artistic License
+ can be found in `/usr/share/common-licenses/Artistic'
+
+License: GPL-1+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 1, or (at your option)
+ any later version.
+ On Debian GNU/Linux systems, the complete text of the GNU General
+ Public License can be found in `/usr/share/common-licenses/GPL'
diff --git a/debian/patches/0001-Use-system-provided-library-and-headers.patch b/debian/patches/0001-Use-system-provided-library-and-headers.patch
new file mode 100644
index 0000000..d60aea1
--- /dev/null
+++ b/debian/patches/0001-Use-system-provided-library-and-headers.patch
@@ -0,0 +1,61 @@
+From: Hilko Bengen <bengen at debian.org>
+Date: Sun, 27 Sep 2015 19:43:34 +0200
+Subject: Use system-provided library and headers
+
+---
+ Makefile.PL | 21 ++++++---------------
+ 1 file changed, 6 insertions(+), 15 deletions(-)
+
+diff --git a/Makefile.PL b/Makefile.PL
+index bd827fb..8e582d5 100644
+--- a/Makefile.PL
++++ b/Makefile.PL
+@@ -5,14 +5,6 @@ use strict;
+ use ExtUtils::MakeMaker;
+ use Config;
+
+-if ((not $ARGV[0]) or (not $ARGV[1]))
+-{
+- print "Usage: perl Makefile.PL <path-to-sendmail-source> <path-to-sendmail-obj.dir>\n";
+- print "(e.g. 'perl Makefile.PL ../sendmail ../sendmail/obj.FreeBSD.4.0-RELEASE.i386')\n";
+- print "\n";
+- exit;
+-}
+-
+ if (not $Config{usethreads})
+ {
+ print "To use this module, your perl interpreter must have been compiled with\n";
+@@ -24,11 +16,11 @@ if (not $Config{usethreads})
+ my $SENDMAIL_PATH = MM->canonpath($ARGV[0]);
+ my $SENDMAIL_OBJ_PATH = MM->canonpath($ARGV[1]);
+
+-my $MILTER_LIB = MM->catdir($SENDMAIL_OBJ_PATH, "libmilter");
+-my $SMUTIL_LIB = MM->catdir($SENDMAIL_OBJ_PATH, "libsmutil");
+-my $SM_LIB = MM->catdir($SENDMAIL_OBJ_PATH, "libsm");
+-my $MILTER_INCLUDE = MM->catdir($SENDMAIL_PATH, "include");
+-my $SENDMAIL_INCLUDE = MM->catdir($SENDMAIL_PATH, "sendmail");
++my $MILTER_LIB = '/usr/lib/libmilter';
++my $SMUTIL_LIB = '/usr/lib/libmilter';
++my $SM_LIB = '/usr/lib/libmilter';
++my $MILTER_INCLUDE= '/usr/include/libmilter';
++my $SENDMAIL_INCLUDE = '';
+
+ sub milter_configure
+ {
+@@ -37,7 +29,7 @@ sub milter_configure
+ my $ccflags;
+
+ # Standard milter libraries
+- $libs = "-L$MILTER_LIB -L$SMUTIL_LIB -L$SM_LIB -lmilter -lsmutil -lsm";
++ $libs = "-L/usr/lib/libmilter -lmilter -lsmutil -lsm";
+
+ # POSIX threads support.
+ if ($Config{libs} =~ /-lpthread/)
+@@ -81,7 +73,6 @@ WriteMakefile(
+ 'VERSION_FROM' => 'Milter.pm',
+ 'CONFIGURE' => \&milter_configure,
+ 'OBJECT' => '$(BASEEXT)$(OBJ_EXT) intpools$(OBJ_EXT) callbacks$(OBJ_EXT)',
+- 'DEFINE' => '',
+ 'INC' => "-I$SENDMAIL_INCLUDE -I$MILTER_INCLUDE",
+ );
+
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..a67810c
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+0001-Use-system-provided-library-and-headers.patch
diff --git a/debian/rules b/debian/rules
index f771938..2d33f6a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,91 +1,4 @@
#!/usr/bin/make -f
-#-*- makefile -*-
-# Made with the aid of dh_make, by Craig Small
-# Sample debian/rules that uses debhelper. GNU copyright 1997 by Joey Hess.
-# Some lines taken from debmake, by Christoph Lameter.
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-export DH_COMPAT=3
-
-PACKAGE=$(shell dh_listpackages)
-
-ifndef PERL
-PERL = /usr/bin/perl
-endif
-
-ifndef DESTDIR
-DESTDIR=..
-endif
-TMP =`pwd`/debian/$(PACKAGE)
-
-OPTIMIZE = -O2 -Wall
-ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
-OPTIMIZE += -g
-endif
-
-build: build-stamp
-build-stamp:
- dh_testdir
-
- $(PERL) Makefile.PL INSTALLDIRS=vendor
- $(MAKE) OPTIMIZE="$(OPTIMIZE)" LD_RUN_PATH=""
- -$(MAKE) test
-
- touch build-stamp
-
-clean:
- dh_testdir
- dh_testroot
- rm -f build-stamp
-
- -$(MAKE) realclean
-
- dh_clean
-
-install:
- dh_testdir
- dh_testroot
- dh_clean -k
- dh_installdirs
-
- # We will install sample.pl as documentation, thank you.
- -rm -f blib/lib/Sendmail/sample.pl
- $(MAKE) install PREFIX=$(TMP)/usr
-
-
-# Build architecture-independent files here.
-binary-indep: build install
-# We have nothing to do by default.
-
-# Build architecture-dependent files here.
-binary-arch: build install
-# dh_testversion
- dh_testdir
- dh_testroot
- dh_installdocs README TODO
- dh_installexamples
- dh_installmenu
-# dh_installemacsen
-# dh_installinit
- dh_installcron
- dh_installman
-# dh_undocumented
- dh_installchangelogs Changes
- dh_link
- dh_strip
- dh_compress
- dh_fixperms
-# dh_makeshlibs
- dh_installdeb
- dh_perl
- dh_shlibdeps
- dh_gencontrol
- dh_md5sums
- dh_builddeb --destdir=$(DESTDIR)
-
-source diff:
- @echo >&2 'source and diff are obsolete - use dpkg-source -b'; false
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary
+%:
+ dh $@
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/libsendmail-milter-perl.git
More information about the Pkg-perl-cvs-commits
mailing list