Received: by mail.netbsd.org (Postfix, from userid 605) id EA5C984DB8; Fri, 1 Sep 2017 03:46:37 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 7D28484DAA for ; Fri, 1 Sep 2017 03:46:37 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id 21zTTiZSu8qy for ; Fri, 1 Sep 2017 03:46:36 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id C8DE584D25 for ; Fri, 1 Sep 2017 03:46:36 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id BEDABFA97; Fri, 1 Sep 2017 03:46:36 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1504237596173880" MIME-Version: 1.0 Date: Fri, 1 Sep 2017 03:46:36 +0000 From: "Amitai Schleier" Subject: CVS commit: pkgsrc/mail/serialmail To: pkgsrc-changes@NetBSD.org Reply-To: schmonz@netbsd.org X-Mailer: log_accum Message-Id: <20170901034636.BEDABFA97@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1504237596173880 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: schmonz Date: Fri Sep 1 03:46:36 UTC 2017 Modified Files: pkgsrc/mail/serialmail: distinfo Added Files: pkgsrc/mail/serialmail/patches: patch-Makefile patch-hier.c patch-leapsecs__read.c Removed Files: pkgsrc/mail/serialmail/patches: patch-aa patch-ab patch-ac Log Message: Modernize patch filenames. To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 pkgsrc/mail/serialmail/distinfo cvs rdiff -u -r0 -r1.1 pkgsrc/mail/serialmail/patches/patch-Makefile \ pkgsrc/mail/serialmail/patches/patch-leapsecs__read.c cvs rdiff -u -r1.3 -r0 pkgsrc/mail/serialmail/patches/patch-aa \ pkgsrc/mail/serialmail/patches/patch-ac cvs rdiff -u -r1.2 -r0 pkgsrc/mail/serialmail/patches/patch-ab cvs rdiff -u -r0 -r1.3 pkgsrc/mail/serialmail/patches/patch-hier.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1504237596173880 Content-Disposition: inline Content-Length: 6414 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/mail/serialmail/distinfo diff -u pkgsrc/mail/serialmail/distinfo:1.8 pkgsrc/mail/serialmail/distinfo:1.9 --- pkgsrc/mail/serialmail/distinfo:1.8 Fri Sep 1 03:43:12 2017 +++ pkgsrc/mail/serialmail/distinfo Fri Sep 1 03:46:36 2017 @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.8 2017/09/01 03:43:12 schmonz Exp $ +$NetBSD: distinfo,v 1.9 2017/09/01 03:46:36 schmonz Exp $ SHA1 (serialmail-0.75.tar.gz) = 76f8d5ae698cff25b3227e51cc99fff1f4a8b137 RMD160 (serialmail-0.75.tar.gz) = 2d12152b9c7d007f76b4d129c2795cd192ba9f83 SHA512 (serialmail-0.75.tar.gz) = f0c7f14330b44f12f8e5f3590416d707bb2daaca84db8fcd236ae05855269005a726d946269c0cbb25f51238fba350420e0e3a1d57f0ab227c447fafcae497dc Size (serialmail-0.75.tar.gz) = 55079 bytes -SHA1 (patch-aa) = 489ae2af99233087fcfb56dd899fe7283401bf7e -SHA1 (patch-ab) = e9325df21f6dd114c0bc9327708c82f8b692c1d5 -SHA1 (patch-ac) = 4f3c3b0f1a65da9c0598ae6b34ab6b1c2a421eb3 +SHA1 (patch-Makefile) = 4f3c3b0f1a65da9c0598ae6b34ab6b1c2a421eb3 +SHA1 (patch-hier.c) = 489ae2af99233087fcfb56dd899fe7283401bf7e +SHA1 (patch-leapsecs__read.c) = e87ceb41f8c1e4c650d5601eaf61fa2fadf98607 Added files: Index: pkgsrc/mail/serialmail/patches/patch-Makefile diff -u /dev/null pkgsrc/mail/serialmail/patches/patch-Makefile:1.1 --- /dev/null Fri Sep 1 03:46:36 2017 +++ pkgsrc/mail/serialmail/patches/patch-Makefile Fri Sep 1 03:46:36 2017 @@ -0,0 +1,53 @@ +$NetBSD: patch-Makefile,v 1.1 2017/09/01 03:46:36 schmonz Exp $ + +DESTDIR support, and avoid building catpages. + +--- Makefile.orig 1998-11-15 02:28:23.000000000 +0000 ++++ Makefile +@@ -28,6 +28,14 @@ auto-str.o: \ + compile auto-str.c substdio.h readwrite.h exit.h + ./compile auto-str.c + ++auto_destdir.c: \ ++auto-str conf-destdir ++ ./auto-str auto_home `head -1 conf-destdir` > auto_destdir.c ++ ++auto_destdir.o: \ ++compile auto_destdir.c ++ ./compile auto_destdir.c ++ + auto_home.c: \ + auto-str conf-home + ./auto-str auto_home `head -1 conf-home` > auto_home.c +@@ -240,9 +248,9 @@ compile hier.c auto_home.h + ./compile hier.c + + install: \ +-load install.o hier.o auto_home.o strerr.a substdio.a open.a error.a \ ++load install.o hier.o auto_destdir.o strerr.a substdio.a open.a error.a \ + str.a +- ./load install hier.o auto_home.o strerr.a substdio.a \ ++ ./load install hier.o auto_destdir.o strerr.a substdio.a \ + open.a error.a str.a + + install.o: \ +@@ -251,8 +259,8 @@ exit.h + ./compile install.c + + instcheck: \ +-load instcheck.o hier.o auto_home.o strerr.a substdio.a error.a str.a +- ./load instcheck hier.o auto_home.o strerr.a substdio.a \ ++load instcheck.o hier.o auto_destdir.o strerr.a substdio.a error.a str.a ++ ./load instcheck hier.o auto_destdir.o strerr.a substdio.a \ + error.a str.a + + instcheck.o: \ +@@ -260,7 +268,7 @@ compile instcheck.c strerr.h error.h rea + ./compile instcheck.c + + it: \ +-man prog install instcheck ++prog install instcheck + + leapsecs.0: \ + leapsecs.3 Index: pkgsrc/mail/serialmail/patches/patch-leapsecs__read.c diff -u /dev/null pkgsrc/mail/serialmail/patches/patch-leapsecs__read.c:1.1 --- /dev/null Fri Sep 1 03:46:36 2017 +++ pkgsrc/mail/serialmail/patches/patch-leapsecs__read.c Fri Sep 1 03:46:36 2017 @@ -0,0 +1,16 @@ +$NetBSD: patch-leapsecs__read.c,v 1.1 2017/09/01 03:46:36 schmonz Exp $ + +Fix to the included libtai, brought over from devel/libtai: + +#include in leapsecs_read.c so we can read leapsecs.dat. + +--- leapsecs_read.c.orig 1998-11-15 02:28:23.000000000 +0000 ++++ leapsecs_read.c +@@ -2,6 +2,7 @@ + #include + #include + #include ++#include + extern int errno; + #include "tai.h" + #include "leapsecs.h" Index: pkgsrc/mail/serialmail/patches/patch-hier.c diff -u /dev/null pkgsrc/mail/serialmail/patches/patch-hier.c:1.3 --- /dev/null Fri Sep 1 03:46:36 2017 +++ pkgsrc/mail/serialmail/patches/patch-hier.c Fri Sep 1 03:46:36 2017 @@ -0,0 +1,58 @@ +$NetBSD: patch-hier.c,v 1.3 2017/09/01 03:46:36 schmonz Exp $ + +Install docs following hier(7), don't install catpages, set reasonable +permissions, and avoid overwriting "setlock" from sysutils/daemontools. + +--- hier.c.orig 1998-11-15 02:28:23.000000000 +0000 ++++ hier.c +@@ -2,36 +2,27 @@ + + void hier() + { +- h(auto_home,-1,-1,02755); ++ h(auto_home,-1,-1,0755); + +- d(auto_home,"bin",-1,-1,02755); +- d(auto_home,"doc",-1,-1,02755); +- d(auto_home,"doc/serialmail",-1,-1,02755); +- d(auto_home,"man",-1,-1,02755); +- d(auto_home,"man/man1",-1,-1,02755); +- d(auto_home,"man/cat1",-1,-1,02755); ++ d(auto_home,"bin",-1,-1,0755); ++ d(auto_home,"share/doc",-1,-1,0755); ++ d(auto_home,"share/doc/serialmail",-1,-1,0755); ++ d(auto_home,"@PKGMANDIR@",-1,-1,0755); ++ d(auto_home,"@PKGMANDIR@/man1",-1,-1,0755); + + c(auto_home,"bin","serialqmtp",-1,-1,0755); + c(auto_home,"bin","serialsmtp",-1,-1,0755); + c(auto_home,"bin","maildirqmtp",-1,-1,0755); + c(auto_home,"bin","maildirsmtp",-1,-1,0755); + c(auto_home,"bin","maildirserial",-1,-1,0755); +- c(auto_home,"bin","setlock",-1,-1,0755); + +- c(auto_home,"man/man1","serialqmtp.1",-1,-1,0644); +- c(auto_home,"man/cat1","serialqmtp.0",-1,-1,0644); +- c(auto_home,"man/man1","serialsmtp.1",-1,-1,0644); +- c(auto_home,"man/cat1","serialsmtp.0",-1,-1,0644); +- c(auto_home,"man/man1","maildirqmtp.1",-1,-1,0644); +- c(auto_home,"man/cat1","maildirqmtp.0",-1,-1,0644); +- c(auto_home,"man/man1","maildirsmtp.1",-1,-1,0644); +- c(auto_home,"man/cat1","maildirsmtp.0",-1,-1,0644); +- c(auto_home,"man/man1","maildirserial.1",-1,-1,0644); +- c(auto_home,"man/cat1","maildirserial.0",-1,-1,0644); +- c(auto_home,"man/man1","setlock.1",-1,-1,0644); +- c(auto_home,"man/cat1","setlock.0",-1,-1,0644); ++ c(auto_home,"@PKGMANDIR@/man1","serialqmtp.1",-1,-1,0644); ++ c(auto_home,"@PKGMANDIR@/man1","serialsmtp.1",-1,-1,0644); ++ c(auto_home,"@PKGMANDIR@/man1","maildirqmtp.1",-1,-1,0644); ++ c(auto_home,"@PKGMANDIR@/man1","maildirsmtp.1",-1,-1,0644); ++ c(auto_home,"@PKGMANDIR@/man1","maildirserial.1",-1,-1,0644); + +- c(auto_home,"doc/serialmail","FROMISP",-1,-1,0644); +- c(auto_home,"doc/serialmail","TOISP",-1,-1,0644); +- c(auto_home,"doc/serialmail","AUTOTURN",-1,-1,0644); ++ c(auto_home,"share/doc/serialmail","FROMISP",-1,-1,0644); ++ c(auto_home,"share/doc/serialmail","TOISP",-1,-1,0644); ++ c(auto_home,"share/doc/serialmail","AUTOTURN",-1,-1,0644); + } --_----------=_1504237596173880--