switched to fork of secure-delete, as requested.

Except more clean ups from the PKGBUILD to make it upstream

2 files changed, 14 insertions, 45 deletions

diff --git a/.SRCINFO b/.SRCINFO
index b77be9367b18..7a766f1a71a2 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,7 @@
-# Generated by mksrcinfo v8
-# Thu Sep 13 03:21:41 UTC 2018
 pkgbase = secure-delete
 	pkgdesc = Secure file, disk, swap, memory erasure utilities
-	pkgver = 3.1
-	pkgrel = 9
+	pkgver = 3.1a
+	pkgrel = 1
 	url = http://www.thc.org/
 	install = secure-delete.install
 	arch = i686
@@ -12,8 +10,8 @@ pkgbase = secure-delete
 	depends = glibc
 	depends = sh
 	conflicts = srm
-	source = secure-delete-3.1.tar.gz::https://github.com/vanhauser-thc/THC-Archive/blob/master/Tools/secure_delete-3.1.tar.gz?raw=true
-	sha256sums = a9d846d1dce3f1bdf13bbb306e8596bc1f263198a086f6beecd90ccf7bddf8d5
+	source = secure-delete-3.1-a.tar.gz::https://github.com/GIJack/secure_delete/archive/3.1-a.tar.gz
+	sha256sums = 2bb8d1f9dbfd2e14f194ee88c730ef8abb8737bf183f715f45b9ca17d59bcebf
 
 pkgname = secure-delete
 
diff --git a/PKGBUILD b/PKGBUILD
index b55b52b52bc8..4468ca0e21e8 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,9 +2,11 @@
 # Uploaded to AUR4:	    GI_Jack <GI_Jack@hackermail.com>
 
 pkgname=secure-delete
-pkgver=3.1
+_pkgname=secure_delete
+_pkgver="3.1-a"
+pkgver=3.1a
 pkgfile="secure_delete-$pkgver"
-pkgrel=9
+pkgrel=1
 pkgdesc="Secure file, disk, swap, memory erasure utilities"
 url="http://www.thc.org/"
 depends=('glibc' 'sh')
@@ -12,12 +14,13 @@ conflicts=('srm')
 license=('GPL')
 arch=('i686' 'x86_64')
 install=${pkgname}.install
-source=(${pkgname}-${pkgver}.tar.gz::https://github.com/vanhauser-thc/THC-Archive/blob/master/Tools/secure_delete-${pkgver}.tar.gz?raw=true)
-sha256sums=('a9d846d1dce3f1bdf13bbb306e8596bc1f263198a086f6beecd90ccf7bddf8d5')
+source=(${pkgname}-${_pkgver}.tar.gz::https://github.com/GIJack/secure_delete/archive/${_pkgver}.tar.gz)
+
+sha256sums=('2bb8d1f9dbfd2e14f194ee88c730ef8abb8737bf183f715f45b9ca17d59bcebf')
 
 build()
 {
-  cd "${srcdir}/${pkgfile}"
+  cd "${srcdir}/${_pkgname}-${_pkgver}"
   sed -i -e 's/mktemp/mkstemp/g' sfill.c
   sed -i -e "s/sswap smem sdel-mod.o/sswap smem/" -e '/test.*sdel-mod/d' \
     -e "s/^srm: /srm: sdel-lib.o /" -e "s/^sfill: /sfill: sdel-lib.o /" \
@@ -28,7 +31,7 @@ build()
 
 package()
 {
-  cd "${srcdir}/${pkgfile}"
+  cd "${srcdir}/${_pkgname}-${_pkgver}"
   make INSTALL_DIR="${pkgdir}/usr/bin" \
     MAN_DIR="${pkgdir}/usr/share/man" \
     DOC_DIR="${pkgdir}/usr/share/doc/secure_delete" \
@@ -36,39 +39,7 @@ package()
   # renamed due to naming conflicts
   mv "${pkgdir}/usr/bin/smem" "${pkgdir}/usr/bin/semem"
   mv "${pkgdir}/usr/share/man/man1/smem.1" "${pkgdir}/usr/share/man/man1/semem.1"
-  sed -i 's/smem/semem/g' "${pkgdir}/usr/bin/the_cleaner.sh"
-  sed -i 's/smem/semem/g' "${pkgdir}/usr/share/man/man1/semem.1"
-  sed -i 's/SMEM/SEMEM/g' "${pkgdir}/usr/share/man/man1/semem.1"
-
+  sed -i s/smem/semem/g "${pkgdir}/usr/share/man/man1/semem.1"
   chmod a+r "${pkgdir}/usr/bin"/*
-
-  # Finally doing this after all these years. I am removing the words "law
-  # enforcement" from the manpages of secure-delete. This was written in another
-  # era. The program is old as dirt, but still widely used for legitimate
-  # purposes.(example, back end for nautilus-wipe). The terms "law enforcement"
-  # essentially amounts to a presumption of guilt, as well as a presumption of
-  # someone's threat model. There is no good reason to ever list law enforcement
-  # as a threat in the manpages, even if it you live in some part of the world
-  # where the regime and police are a serious threat to Freedom. For users in
-  # a Free part of the world. you've implicated them with criminal intent when
-  # they otherwise have none: i.e. protecting against identity theft, by far
-  # the most common cyber-crime, now have the presumption of being
-  # cybercriminals themselves
-  #
-  # Secure Delete, I say again, has use as a legitimate defensive security tool.
-  #
-  # There is no good reason to ever list "Law Enforcement", or any part of a
-  # regime security apparatus as a threat in software documentation. Ever.
-  #
-  # Van Hausen, if you ever read this, pls fix this upstream.
-  
-  sed -i 's/thiefs, law enforcement or other threats/an adversary/g' "${pkgdir}/usr/share/man/man1/srm.1"
-  sed -i 's/thiefs, law enforcement/an adversary./g' "${pkgdir}/usr/share/man/man1/sswap.1"
-  sed -i 's/or other threats.//g' "${pkgdir}/usr/share/man/man1/sswap.1"
-  sed -i 's/thiefs, law enforcement/an adversary./g' "${pkgdir}/usr/share/man/man1/semem.1"
-  sed -i 's/or other threats.//g' "${pkgdir}/usr/share/man/man1/semem.1"
-  sed -i 's/thiefs, law enforcement/an adversary./g' "${pkgdir}/usr/share/man/man1/sfill.1"
-  sed -i 's/or other threats.//g' "${pkgdir}/usr/share/man/man1/sfill.1"
-
 }