Publish version 1.0-2

4 files changed, 65 insertions, 30 deletions

diff --git a/.SRCINFO b/.SRCINFO
index de1831135aa8..923a967b094e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,15 +1,17 @@
 pkgbase = skdet
-	pkgdesc = Simple rootkit detector that can be used by rkhunter.
+	pkgdesc = Simple rootkit detector that can be used by rkhunter
 	pkgver = 1.0
-	pkgrel = 1
-	url = http://dvgevers.home.xs4all.nl/
-	arch = i686
+	pkgrel = 2
+	url = https://dvgevers.home.xs4all.nl
 	arch = x86_64
+	arch = i686
 	license = GPL
-	source = http://dvgevers.home.xs4all.nl/skdet/skdet-1.0.tar.bz2
-	source = http://dvgevers.home.xs4all.nl/skdet/skdet-fix-includes.diff
+	depends = glibc
+	source = https://dvgevers.home.xs4all.nl/skdet/skdet-1.0.tar.bz2
+	source = https://dvgevers.home.xs4all.nl/skdet/skdet-fix-includes.diff
+	source = ldflags.patch
 	sha256sums = a5842d3e56c8586c52879700453f740744c374a1f2c648eef337cae7e244e7b6
 	sha256sums = 1ee83c1122dfe74c8aec7800fe0026affda6ea37c7643491fd8df62f08ed2fbc
+	sha256sums = 51ae92ef28fcc7603d00769b412f74bf7873c0d196be03b14bbed0b8c11ec331
 
 pkgname = skdet
-
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000000..e3fff4b09ea7
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,5 @@
+*
+!.gitignore
+!PKGBUILD
+!.SRCINFO
+!ldflags.patch
diff --git a/PKGBUILD b/PKGBUILD
index 79a0daf832df..8e489e5edf35 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,34 +1,50 @@
+# Maintainer: Carl Smedstad <carl.smedstad at protonmail dot com>
 # Contributor: ganymede
 
 pkgname=skdet
 pkgver=1.0
-pkgrel=1
-pkgdesc='Simple rootkit detector that can be used by rkhunter.'
-arch=('i686' 'x86_64')
-url='http://dvgevers.home.xs4all.nl/'
-license=('GPL')
-depends=()
-source=("http://dvgevers.home.xs4all.nl/${pkgname}/${pkgname}-${pkgver}.tar.bz2"
-        "http://dvgevers.home.xs4all.nl/${pkgname}/${pkgname}-fix-includes.diff")
-sha256sums=('a5842d3e56c8586c52879700453f740744c374a1f2c648eef337cae7e244e7b6'
-            '1ee83c1122dfe74c8aec7800fe0026affda6ea37c7643491fd8df62f08ed2fbc')
+pkgrel=2
+pkgdesc="Simple rootkit detector that can be used by rkhunter"
+arch=(x86_64 i686)
+url="https://dvgevers.home.xs4all.nl"
+license=(GPL)
+depends=(glibc)
+source=(
+  "https://dvgevers.home.xs4all.nl/$pkgname/$pkgname-$pkgver.tar.bz2"
+  "https://dvgevers.home.xs4all.nl/$pkgname/$pkgname-fix-includes.diff"
+  "ldflags.patch"
+)
+sha256sums=(
+  'a5842d3e56c8586c52879700453f740744c374a1f2c648eef337cae7e244e7b6'
+  '1ee83c1122dfe74c8aec7800fe0026affda6ea37c7643491fd8df62f08ed2fbc'
+  '51ae92ef28fcc7603d00769b412f74bf7873c0d196be03b14bbed0b8c11ec331'
+)
+
+_archive="$pkgname-$pkgver"
+
+prepare() {
+  cd "$_archive"
+
+  patch -N -p1 -i "$srcdir/skdet-fix-includes.diff"
+  patch -N -p1 -i "$srcdir/ldflags.patch"
+}
 
 build() {
-  cd "${pkgname}-${pkgver}"
-  rm "${pkgname}"
-  patch -N -p1 -i "${srcdir}/skdet-fix-includes.diff"
+  cd "$_archive"
+
+  rm skdet
   make
 }
 
 package() {
-  cd "${pkgname}-${pkgver}"
-  install -dm 755 "${pkgdir}/usr/bin"
-  install -dm 755 "${pkgdir}/usr/share/doc/${pkgname}-${pkgver}/tests"
-  install -m 750 "${pkgname}" "${pkgdir}/usr/bin/"
-  install -m 644 AUTHORS "${pkgdir}/usr/share/doc/${pkgname}-${pkgver}/"
-  install -m 644 ChangeLog "${pkgdir}/usr/share/doc/${pkgname}-${pkgver}/"
-  install -m 644 CONTRIBUTIONS "${pkgdir}/usr/share/doc/${pkgname}-${pkgver}/"
-  install -m 644 CREDITS "${pkgdir}/usr/share/doc/${pkgname}-${pkgver}/"
-  install -m 644 README "${pkgdir}/usr/share/doc/${pkgname}-${pkgver}/"
-  install -m 644 tests/* "${pkgdir}/usr/share/doc/${pkgname}-${pkgver}/tests/"
+  cd "$_archive"
+
+  install -dm 755 "$pkgdir/usr/bin"
+  install -dm 755 "$pkgdir/usr/share/doc/$pkgname-$pkgver"
+  install -m 755 "$pkgname" "$pkgdir/usr/bin/"
+  install -m 644 AUTHORS "$pkgdir/usr/share/doc/$pkgname-$pkgver/"
+  install -m 644 ChangeLog "$pkgdir/usr/share/doc/$pkgname-$pkgver/"
+  install -m 644 CONTRIBUTIONS "$pkgdir/usr/share/doc/$pkgname-$pkgver/"
+  install -m 644 CREDITS "$pkgdir/usr/share/doc/$pkgname-$pkgver/"
+  install -m 644 README "$pkgdir/usr/share/doc/$pkgname-$pkgver/"
 }
diff --git a/ldflags.patch b/ldflags.patch
new file mode 100644
index 000000000000..8eb15254e2ac
--- /dev/null
+++ b/ldflags.patch
@@ -0,0 +1,12 @@
+diff --unified --recursive --text skdet-1.0.orig/Makefile skdet-1.0/Makefile
+--- skdet-1.0.orig/Makefile	2023-10-21 17:50:15.305851560 +0200
++++ skdet-1.0/Makefile	2023-10-21 17:50:29.055858022 +0200
+@@ -14,7 +14,7 @@
+ 	$(CC) $(CFLAGS) -c $(SRC)/skdet.c -o skdet.o
+ 	$(CC) $(CFLAGS) -c $(SRC)/usage.c -o usage.o
+ 	$(CC) $(CFLAGS) -c $(SRC)/version.c -o version.o
+-	$(LD) $(CFLAGS) det-rootkit.o pid-info.o scanner.o skdet.o usage.o version.o -o $(BINARY)
++	$(LD) $(CFLAGS) $(LDFLAGS) det-rootkit.o pid-info.o scanner.o skdet.o usage.o version.o -o $(BINARY)
+ 	@rm -rf det-rootkit.o pid-info.o scanner.o skdet.o usage.o version.o
+ 	@$(STRIP) $(BINARY)
+