From 84beba36ed6ea222009b351fadb73acbee04bb44 Mon Sep 17 00:00:00 2001 From: kamil Date: Thu, 27 Oct 2016 19:49:44 +0000 Subject: Update srm from 1.2.8 to 1.2.15 pkgsrc changes: - set LICENSE (x11) - add test target - add new NetBSD patches - keep INTERIX patch, not tested Upstream changelog ================== release 1.2.15 fix handling of files > 2GB on Windows. fix handling of symlinks to files owned by root. release 1.2.14 fix fill() function, this fixes DoE and Gutmann modes. new --rcmp mode. use simple mode by default and not Gutmann 35 pass. release 1.2.13 fix handling of OsX resource forks. release-1_2_12 now using SVN on SourceForge. small updates to autotools build files. support Haiku operating system. overwrite POSIX extended attributes. srm has exit code != 0 if removing any file or directory failed. handle alternate data streams on Windows and NTFS. handle hard links on Windows and NTFS. release-1_2_11 Win32 command line wildcard expansion -v -v displays current write position SIGINFO, SIGUSR2 display current write position -x does not cross file system boundaries overwrite block devices release-1_2_10 Mac OsX compiles and works again add DoE wipe mode fix deletion of named pipes/fifos Debian fixes Win32 fixes release-1_2_9 fix deletion of 0 byte files fix handling of files <4096 bytes fix handling of files >2GiB on 32bit OpenBSD compat switch handle OsX ressource fork added some code from OsX port Win32 version --- security/srm/Makefile | 23 +++++++++------- security/srm/PLIST | 3 ++- security/srm/distinfo | 14 +++++----- security/srm/patches/patch-aa | 16 ++++++----- security/srm/patches/patch-src_sunlink.c | 46 ++++++++++++++++++++++++++++++++ security/srm/patches/patch-test.sh | 15 +++++++++++ 6 files changed, 93 insertions(+), 24 deletions(-) create mode 100644 security/srm/patches/patch-src_sunlink.c create mode 100644 security/srm/patches/patch-test.sh (limited to 'security/srm') diff --git a/security/srm/Makefile b/security/srm/Makefile index 8ddc21f6f63..8fed0c02edf 100644 --- a/security/srm/Makefile +++ b/security/srm/Makefile @@ -1,17 +1,20 @@ -# $NetBSD: Makefile,v 1.6 2012/10/23 18:16:59 asau Exp $ +# $NetBSD: Makefile,v 1.7 2016/10/27 19:49:44 kamil Exp $ # -DISTNAME= srm-1.2.8 -PKGREVISION= 1 -CATEGORIES= security -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=srm/} +DISTNAME= srm-1.2.15 +CATEGORIES= security +MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=srm/} -MAINTAINER= pkgsrc-users@NetBSD.org -HOMEPAGE= http://srm.sourceforge.net/ -COMMENT= Secure replacement for rm(1) +MAINTAINER= pkgsrc-users@NetBSD.org +HOMEPAGE= http://srm.sourceforge.net/ +COMMENT= Secure replacement for rm(1) +LICENSE= x11 -GNU_CONFIGURE= yes +GNU_CONFIGURE= yes -CONFLICTS+= sr-[0-9]* # bin/srm +CONFLICTS+= sr-[0-9]* # bin/srm + +do-test: + ${RUN} cd ${WRKSRC} && ${SETENV} ${TEST_ENV} ./test.sh .include "../../mk/bsd.pkg.mk" diff --git a/security/srm/PLIST b/security/srm/PLIST index 621fd2154b4..0404a41d926 100644 --- a/security/srm/PLIST +++ b/security/srm/PLIST @@ -1,3 +1,4 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 2004/03/01 09:43:06 cube Exp $ +@comment $NetBSD: PLIST,v 1.2 2016/10/27 19:49:44 kamil Exp $ +bin/fill_test bin/srm man/man1/srm.1 diff --git a/security/srm/distinfo b/security/srm/distinfo index 1e08d6731cb..11faa929430 100644 --- a/security/srm/distinfo +++ b/security/srm/distinfo @@ -1,7 +1,9 @@ -$NetBSD: distinfo,v 1.4 2015/11/04 01:18:10 agc Exp $ +$NetBSD: distinfo,v 1.5 2016/10/27 19:49:44 kamil Exp $ -SHA1 (srm-1.2.8.tar.gz) = 8b7aafc95b3ef67e2c737030567222bf50082188 -RMD160 (srm-1.2.8.tar.gz) = d1ce5fe2ec13e45c5620e6a71c1f2dfcb49ab1bc -SHA512 (srm-1.2.8.tar.gz) = 2e67c3d69e6573ae1248c57d9e815a5d6c64c9e4c2ecc2189823d4a343de795057a4e6efa1d9195a1daa150a92624211b4ce7a091d48f430632030e7a0678ec7 -Size (srm-1.2.8.tar.gz) = 88067 bytes -SHA1 (patch-aa) = a94522473ee72315d3ab38bfa70f336290431b9b +SHA1 (srm-1.2.15.tar.gz) = 137bb9b94819de48b8061e4185552b6170bbf9c6 +RMD160 (srm-1.2.15.tar.gz) = 61b674b21acf48ec837fcaf59836abdda62bc496 +SHA512 (srm-1.2.15.tar.gz) = a8ec78473c55b70557fca88f525998ed51df3be58618b9da220e1bb73df013163f4e1563cbe2062b9cf1512152afeb9004b5be0be69cc1278c0d28597310dfd2 +Size (srm-1.2.15.tar.gz) = 132031 bytes +SHA1 (patch-aa) = e73c6bc1fb3fcbd019accf417aec530694386a97 +SHA1 (patch-src_sunlink.c) = 3c6437534b62191a05a96761e54c1252bd43d0ed +SHA1 (patch-test.sh) = 8383932967730cb55c9b530d73c374122adea197 diff --git a/security/srm/patches/patch-aa b/security/srm/patches/patch-aa index ef12de0051b..f6874956cf3 100644 --- a/security/srm/patches/patch-aa +++ b/security/srm/patches/patch-aa @@ -1,14 +1,16 @@ -$NetBSD: patch-aa,v 1.1 2005/11/01 18:59:34 tv Exp $ +$NetBSD: patch-aa,v 1.2 2016/10/27 19:49:44 kamil Exp $ ---- src/rename_unlink.c.orig 2003-04-08 12:16:56.000000000 -0400 +Disable sync() on INTERIX. + +--- src/rename_unlink.c.orig 2015-02-26 16:12:02.000000000 +0000 +++ src/rename_unlink.c -@@ -45,7 +45,9 @@ int rename_unlink(const char *path) { - if (rename(path, new_name) == -1) +@@ -105,7 +105,9 @@ int rename_unlink(const char *path) { + if (rename(path, new_name) < 0) return -1; +#ifndef __INTERIX sync(); +#endif - - if (lstat(new_name, &statbuf) == -1) { - /* Bad mojo, we just renamed to new_name and now the path is invalid. + + /* check the new name */ + if (lstat(new_name, &statbuf) < 0) { diff --git a/security/srm/patches/patch-src_sunlink.c b/security/srm/patches/patch-src_sunlink.c new file mode 100644 index 00000000000..5be3d101c53 --- /dev/null +++ b/security/srm/patches/patch-src_sunlink.c @@ -0,0 +1,46 @@ +$NetBSD: patch-src_sunlink.c,v 1.1 2016/10/27 19:49:44 kamil Exp $ + +Add NetBSD support. + +--- src/sunlink.c.orig 2015-02-26 16:12:02.000000000 +0000 ++++ src/sunlink.c +@@ -105,7 +105,7 @@ static volatile int SIGINT_received = 0; + #if defined(__linux__) && !defined(__USE_GNU) + typedef __sighandler_t sighandler_t; + #endif +-#if defined(__FreeBSD__) || defined(__OpenBSD__) ++#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) + typedef sig_t sighandler_t; + #endif + +@@ -837,8 +837,13 @@ next_ads: + + #if defined(HAVE_SYS_VFS_H) || (defined(HAVE_SYS_PARAM_H) && defined(HAVE_SYS_MOUNT_H)) + { ++#if defined(__NetBSD__) ++ struct statvfs fs_stats; ++ if (fstatvfs(srm.fd, &fs_stats) < 0 && errno != ENOSYS) ++#else + struct statfs fs_stats; + if (fstatfs(srm.fd, &fs_stats) < 0 && errno != ENOSYS) ++#endif + { + int e=errno; + close(srm.fd); +@@ -848,7 +853,7 @@ next_ads: + + #if defined(__linux__) + srm.buffer_size = fs_stats.f_bsize; +-#elif defined(__FreeBSD__) || defined(__APPLE__) ++#elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__APPLE__) + srm.buffer_size = fs_stats.f_iosize; + #else + #error Please define your platform. +@@ -907,6 +912,7 @@ next_ads: + and catch only platforms supporting NOUNLINK here. + + OpenBSD - doesn't support nounlink (As of 3.1) ++ NetBSD - doesn't support nounlink (as of 7.99.41) + FreeBSD - supports nounlink (from 4.4 on?) + Tru64 - unknown + MacOS X - doesn't support NOUNLINK (as of 10.3.5) diff --git a/security/srm/patches/patch-test.sh b/security/srm/patches/patch-test.sh new file mode 100644 index 00000000000..d431e4472dc --- /dev/null +++ b/security/srm/patches/patch-test.sh @@ -0,0 +1,15 @@ +$NetBSD: patch-test.sh,v 1.1 2016/10/27 19:49:44 kamil Exp $ + +Add NetBSD support + +--- test.sh.orig 2015-02-26 16:12:02.000000000 +0000 ++++ test.sh +@@ -187,7 +187,7 @@ OS=$(uname -s) + if [ "$OS" = Linux ] ; then + setfattr -n user.a1 -v "The value of extended attribute number 1" $FN + setfattr -n user.num2 -v "A second attribute." $FN +-elif [ "$OS" = FreeBSD ] ; then ++elif [ "x$OS" = xFreeBSD -o "x$OS" = xNetBSD ] ; then + setextattr user a1 "The value of extended attribute number 1" $FN + setextattr user num2 "A second attribute." $FN + elif [ "$OS" = Darwin ] ; then -- cgit v1.2.3