1.3.0-2

3 files changed, 60 insertions, 24 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e9b77171cbba..d889ae1b640e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,14 +1,17 @@
 pkgbase = mlmmj
-	pkgdesc = Simple and slim mailing-list manager inspired by ezmlm
+	pkgdesc = Simple and slim mailing list manager (MLM) inspired by ezmlm
 	pkgver = 1.3.0
-	pkgrel = 1
+	pkgrel = 2
 	url = http://mlmmj.org/
 	arch = i686
 	arch = x86_64
 	license = MIT
 	depends = sh
-	source = http://mlmmj.org/releases/mlmmj-1.3.0.tar.bz2
-	sha256sums = 1c5d898143433147aa1b448fe041b2eecf6ab1601d451d426441a0a63008f242
+	source = http://mlmmj.org/releases/mlmmj-1.3.0.tar.gz
+	source = mlmmj-1.3.0.diff
+	sha256sums = 7609d0dd804f0c084c2e483eb58c60012b698bc76464537852a1ee1ff9c6f0e9
+	sha256sums = 18dd3c663c0c5cc4a713b70b7eb03c2a2b9d6af316e1e080febda1ef61be399c
+	b2sums = 6b56ead8fb5840964835b139be7566a14df53266a7d83323176f73430c76702f0dc50f5b255e5881887ad8618abe3ace6cd710128821654709b6135b53adbfe4
+	b2sums = c0beb31414df706e3ce2fc62f8d23f893c8ce199adc2a81a48d3e3df6ddcbd131588d0ad12a4cfcd1d0e3db799ed95101a40d9b88d7ee758413310e2dfe205ab
 
 pkgname = mlmmj
-
diff --git a/PKGBUILD b/PKGBUILD
index 62fa6ccc3f50..c663658bf00f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,35 +1,48 @@
-# Maintainer: Marvin Gülker <quintus at quintilianus point eu>
+# Maintainer: Klaus Alexander Seistrup <klaus@seistrup.dk>
+# Contributor: Marvin Gülker <quintus at quintilianus point eu>
 # Contributor: Pierre Chapuis <catwell at archlinux dot us>
 
 pkgname='mlmmj'
 pkgver=1.3.0
-pkgrel=1
-pkgdesc='Simple and slim mailing-list manager inspired by ezmlm'
+pkgrel=2
+pkgdesc='Simple and slim mailing list manager (MLM) inspired by ezmlm'
 depends=('sh')
 arch=('i686' 'x86_64')
 url='http://mlmmj.org/'
 license=('MIT')
-source=("http://mlmmj.org/releases/$pkgname-$pkgver.tar.bz2")
-sha256sums=('1c5d898143433147aa1b448fe041b2eecf6ab1601d451d426441a0a63008f242')
+source=("http://mlmmj.org/releases/mlmmj-$pkgver.tar.gz"
+	"$pkgname-$pkgver.diff")
+sha256sums=('7609d0dd804f0c084c2e483eb58c60012b698bc76464537852a1ee1ff9c6f0e9'
+            '18dd3c663c0c5cc4a713b70b7eb03c2a2b9d6af316e1e080febda1ef61be399c')
+b2sums=('6b56ead8fb5840964835b139be7566a14df53266a7d83323176f73430c76702f0dc50f5b255e5881887ad8618abe3ace6cd710128821654709b6135b53adbfe4'
+        'c0beb31414df706e3ce2fc62f8d23f893c8ce199adc2a81a48d3e3df6ddcbd131588d0ad12a4cfcd1d0e3db799ed95101a40d9b88d7ee758413310e2dfe205ab')
+
+prepare() {
+    cd "$pkgname-$pkgver"
+    patch -Np1 -i "$srcdir/$pkgname-$pkgver.diff"
+}
 
 build() {
-  cd $pkgname-$pkgver
-  ./configure --prefix=/usr
-  make
+    cd "$pkgname-$pkgver"
+    ./configure --prefix=/usr
+    make
 }
 
 package() {
-  cd $pkgname-$pkgver
-  make DESTDIR=$pkgdir install
+    cd "$pkgname-$pkgver"
+    make DESTDIR="$pkgdir" install
 
-  install -D -m 0644 LICENSE  $pkgdir/usr/share/licenses/mlmmj/LICENSE
-  install -D -m 0644 COPYING  $pkgdir/usr/share/licenses/mlmmj/COPYING
-  install -D -m 0644 AUTHORS  $pkgdir/usr/share/licenses/mlmmj/AUTHORS
-  install -D -m 0644 FAQ      $pkgdir/usr/share/doc/mlmmj/FAQ
-  install -D -m 0644 TUNABLES $pkgdir/usr/share/doc/mlmmj/TUNABLES
-  install -D -m 0644 UPGRADE  $pkgdir/usr/share/doc/mlmmj/UPGRADE
+    install -m 0755 -d        "$pkgdir/usr/share/licenses/mlmmj"
+    install -m 0644 AUTHORS   "$pkgdir/usr/share/licenses/mlmmj/"
+    install -m 0644 COPYING   "$pkgdir/usr/share/licenses/mlmmj/"
+    install -m 0644 LICENSE   "$pkgdir/usr/share/licenses/mlmmj/"
 
-  for f in `ls README*`; do
-      install -D -m 0644 $f $pkgdir/usr/share/doc/mlmmj/$f
-  done
+    install -m 0755 -d        "$pkgdir/usr/share/doc/mlmmj"
+    install -m 0644 ChangeLog "$pkgdir/usr/share/doc/mlmmj/"
+    install -m 0644 FAQ       "$pkgdir/usr/share/doc/mlmmj/"
+    install -m 0644 README*   "$pkgdir/usr/share/doc/mlmmj/"
+    install -m 0644 TUNABLES  "$pkgdir/usr/share/doc/mlmmj/"
+    install -m 0644 UPGRADE   "$pkgdir/usr/share/doc/mlmmj/"
 }
+
+# eof
diff --git a/mlmmj-1.3.0.diff b/mlmmj-1.3.0.diff
new file mode 100644
index 000000000000..4501d443cdf3
--- /dev/null
+++ b/mlmmj-1.3.0.diff
@@ -0,0 +1,20 @@
+--- mlmmj-1.3.0/include/mlmmj.h	2013-01-11 09:40:19.000000000 +0100
++++ mlmmj-1.3.0/include/mlmmj.h	2021-06-24 15:42:53.799363500 +0200
+@@ -81,7 +81,7 @@
+ 	SUB_NONE /* For when an address is not subscribed at all */
+ };
+ 
+-char *subtype_strs[7]; /* count matches enum above; defined in subscriberfuncs.c */
++extern char *subtype_strs[7]; /* count matches enum above; defined in subscriberfuncs.c */
+ 
+ enum subreason {
+ 	SUB_REQUEST,
+@@ -92,7 +92,7 @@
+ 	SUB_SWITCH
+ };
+ 
+-char * subreason_strs[6]; /* count matches enum above; defined in subscriberfuncs.c */
++extern char * subreason_strs[6]; /* count matches enum above; defined in subscriberfuncs.c */
+ 
+ void print_version(const char *prg);
+