diff options
-rw-r--r-- | .SRCINFO | 36 | ||||
-rw-r--r-- | PKGBUILD | 87 | ||||
-rw-r--r-- | mlmmj-1.3.0-bash.diff | 149 | ||||
-rw-r--r-- | mlmmj-1.3.0.diff | 20 |
4 files changed, 54 insertions, 238 deletions
@@ -1,35 +1,25 @@ pkgbase = mlmmj pkgdesc = Simple and slim mailing list manager (MLM) inspired by ezmlm - pkgver = 1.3.0 - pkgrel = 9 - url = http://mlmmj.org/ + pkgver = 1.4.5 + pkgrel = 2 + url = https://codeberg.org/mlmmj/mlmmj + arch = aarch64 + arch = armv7h arch = i686 arch = x86_64 - arch = armv7h - arch = aarch64 license = MIT depends = bash depends = glibc depends = smtp-server - source = http://mlmmj.org/releases/mlmmj-1.3.0.tar.gz - source = mlmmj-1.3.0.diff - source = mlmmj-1.3.0-bash.diff + options = lto + source = https://codeberg.org/mlmmj/mlmmj/releases/download/RELEASE_1_4_5/mlmmj-1.4.5.tar.xz source = sysuser.conf source = tmpfile.conf - sha256sums = 7609d0dd804f0c084c2e483eb58c60012b698bc76464537852a1ee1ff9c6f0e9 - sha256sums = 18dd3c663c0c5cc4a713b70b7eb03c2a2b9d6af316e1e080febda1ef61be399c - sha256sums = 3a853e7288cb7a077374e3a79890ec47dbbab208611600ee3d2726e5f17889be - sha256sums = 4bbc24fc73ecb2d8f509c47eacff290921bb70a24b2a87b19704336cb4c466f1 - sha256sums = 1836f8ddb013f3762e79b2bbd9e81f850d976c984fa2e24bcc8f39072eeb0d37 - sha512sums = ea40cae02a7ca5949af6ae01adcdc97536f63f9336f1e4081cf875312bb121a285405353a5863aa6d5f09834b2b6dd328650ed212a30f4940b5fbf82d20184cf - sha512sums = a8d74b9f32858be4fb648ba26d85cfc5c1eaedce6f9aec764812164f85f9182207a736df0e0d4710210f7d4ac44cef6342b7dbe566012492cddbcf4c01c3c8f2 - sha512sums = 2dd3ebd263467d8fb6c14f4acb138b5fc38735bfd9c9bb676acb8b2bb1504897ca27a008ef9409903ba911b1c1f763392e8fe3cd6d2d73ce026aa9751c2a744a - sha512sums = c0d96b8d9b1866892be4d14967390cdff2d74a5e4d099bce3c5dadbeef93b6bf69020042c4f986081dc9de62b5707b7f49ce4514999d7a35ceab6e0621a6bf6d - sha512sums = 5be7399233f1d2f4b806d2049801cd2f84061de5abcc3565b75e10e6ed197d33370e5d4cf6f8c6fc2e17ff7b984e036b7e4ab69a929ac045fa2f202f29229e1f - b2sums = 6b56ead8fb5840964835b139be7566a14df53266a7d83323176f73430c76702f0dc50f5b255e5881887ad8618abe3ace6cd710128821654709b6135b53adbfe4 - b2sums = c0beb31414df706e3ce2fc62f8d23f893c8ce199adc2a81a48d3e3df6ddcbd131588d0ad12a4cfcd1d0e3db799ed95101a40d9b88d7ee758413310e2dfe205ab - b2sums = 8dd8291af4a6b04565df816f0fb193e749824fc05c4226f748b272346d9077ae5bc9904ecc245e5161e267e9d57cb9202db6b8d8a29c9724f563677798534fcd - b2sums = 946ee7047c127ce3a7a5d784b97002f2373231acad4c1c7cfd65b1fbc4e49761deaf19d74ad8764943736897f03afb814bd92d81e58767f5af3cb87a4a7fa826 - b2sums = 6fc6d4bde198896dc706652cd0e32fde43ac47b40c4d3cd2d130aa5e0b3b7cdb1d97c0124d43f9240c143f3f6641fc626a62f2350b8b43c8cfdfb8fcca33391d + sha256sums = 957a018d9e6d169fd54b7109bab747309cf72fe0072b54d11d174675da526126 + sha256sums = SKIP + sha256sums = SKIP + b2sums = 9390cfd343449160f6c9e244e75af539b73a4ba468e9c3ddf4bc21423e79c6d4d2905b8be829ad0232be00e63f47881d34cf571c9d480b95228df732c32bb7fe + b2sums = SKIP + b2sums = SKIP pkgname = mlmmj @@ -1,76 +1,71 @@ # Maintainer: Klaus Alexander Seistrup <klaus@seistrup.dk> # Contributor: Marvin Gülker <quintus at quintilianus point eu> # Contributor: Pierre Chapuis <catwell at archlinux dot us> +# Contributor: Uffe Jakobsen <uffe at uffe dot org> # -*- mode: sh -*- pkgname='mlmmj' -pkgver=1.3.0 -pkgrel=9 +pkgver=1.4.5 +_pkgver=1_4_5 +pkgrel=2 pkgdesc='Simple and slim mailing list manager (MLM) inspired by ezmlm' depends=('bash' 'glibc' 'smtp-server') -arch=('i686' 'x86_64' 'armv7h' 'aarch64') -url='http://mlmmj.org/' -license=('MIT') +arch=('aarch64' 'armv7h' 'i686' 'x86_64') +#url='http://mlmmj.org/' +url='https://codeberg.org/mlmmj/mlmmj' +license=('MIT') # SPDX-License-Identifier: MIT +# Development has moved to Codeberg source=( - "http://mlmmj.org/releases/$pkgname-$pkgver.tar.gz" - "$pkgname-$pkgver.diff" - "$pkgname-$pkgver-bash.diff" + "$url/releases/download/RELEASE_$_pkgver/mlmmj-$pkgver.tar.xz" 'sysuser.conf' 'tmpfile.conf' ) -sha256sums=( - '7609d0dd804f0c084c2e483eb58c60012b698bc76464537852a1ee1ff9c6f0e9' - '18dd3c663c0c5cc4a713b70b7eb03c2a2b9d6af316e1e080febda1ef61be399c' - '3a853e7288cb7a077374e3a79890ec47dbbab208611600ee3d2726e5f17889be' - '4bbc24fc73ecb2d8f509c47eacff290921bb70a24b2a87b19704336cb4c466f1' - '1836f8ddb013f3762e79b2bbd9e81f850d976c984fa2e24bcc8f39072eeb0d37' -) -sha512sums=( - 'ea40cae02a7ca5949af6ae01adcdc97536f63f9336f1e4081cf875312bb121a285405353a5863aa6d5f09834b2b6dd328650ed212a30f4940b5fbf82d20184cf' - 'a8d74b9f32858be4fb648ba26d85cfc5c1eaedce6f9aec764812164f85f9182207a736df0e0d4710210f7d4ac44cef6342b7dbe566012492cddbcf4c01c3c8f2' - '2dd3ebd263467d8fb6c14f4acb138b5fc38735bfd9c9bb676acb8b2bb1504897ca27a008ef9409903ba911b1c1f763392e8fe3cd6d2d73ce026aa9751c2a744a' - 'c0d96b8d9b1866892be4d14967390cdff2d74a5e4d099bce3c5dadbeef93b6bf69020042c4f986081dc9de62b5707b7f49ce4514999d7a35ceab6e0621a6bf6d' - '5be7399233f1d2f4b806d2049801cd2f84061de5abcc3565b75e10e6ed197d33370e5d4cf6f8c6fc2e17ff7b984e036b7e4ab69a929ac045fa2f202f29229e1f' -) -b2sums=( - '6b56ead8fb5840964835b139be7566a14df53266a7d83323176f73430c76702f0dc50f5b255e5881887ad8618abe3ace6cd710128821654709b6135b53adbfe4' - 'c0beb31414df706e3ce2fc62f8d23f893c8ce199adc2a81a48d3e3df6ddcbd131588d0ad12a4cfcd1d0e3db799ed95101a40d9b88d7ee758413310e2dfe205ab' - '8dd8291af4a6b04565df816f0fb193e749824fc05c4226f748b272346d9077ae5bc9904ecc245e5161e267e9d57cb9202db6b8d8a29c9724f563677798534fcd' - '946ee7047c127ce3a7a5d784b97002f2373231acad4c1c7cfd65b1fbc4e49761deaf19d74ad8764943736897f03afb814bd92d81e58767f5af3cb87a4a7fa826' - '6fc6d4bde198896dc706652cd0e32fde43ac47b40c4d3cd2d130aa5e0b3b7cdb1d97c0124d43f9240c143f3f6641fc626a62f2350b8b43c8cfdfb8fcca33391d' -) - -prepare() { - cd "$pkgname-$pkgver" || exit 1 - - patch -Np1 -i "$srcdir/$pkgname-$pkgver.diff" - patch -Np1 -i "$srcdir/$pkgname-$pkgver-bash.diff" -} +options=('lto') build() { - cd "$pkgname-$pkgver" || exit 1 + cd "$pkgname-$pkgver" - ./configure --prefix=/usr + # RFC-0023 + # 🔗 https://rfc.archlinux.page/0023-pack-relative-relocs/ + # + # ld(1) says: “Supported for i386 and x86-64.” + case "Z${CARCH:-unknown}" in + 'Zx86_64' | 'Zi386' ) + export LDFLAGS="$LDFLAGS -Wl,-z,pack-relative-relocs" + ;; + * ) : pass ;; + esac + + # Tests require “atf-c”. Anyone? + ./configure --prefix=/usr --disable-tests make } package() { - cd "$pkgname-$pkgver" || exit 1 + cd "$pkgname-$pkgver" make DESTDIR="$pkgdir" install for fname in AUTHORS COPYING LICENSE; do - install -Dm0644 "$fname" "$pkgdir/usr/share/licenses/$pkgname/$fname" + install -vDm0644 "$fname" "$pkgdir/usr/share/licenses/$pkgname/$fname" done - for fname in ChangeLog FAQ README README.* TODO TUNABLES UPGRADE; do - install -Dm0644 "$fname" "$pkgdir/usr/share/doc/$pkgname/$fname" - done + install -vDm0644 -t "$pkgdir/usr/share/doc/$pkgname/" \ + ChangeLog FAQ README README.* TODO TUNABLES UPGRADE - cd "$srcdir" || exit 1 + cd "$srcdir" - install -Dm0644 sysuser.conf "$pkgdir/usr/lib/sysusers.d/$pkgname.conf" - install -Dm0644 tmpfile.conf "$pkgdir/usr/lib/tmpfiles.d/$pkgname.conf" + install -vDm0644 sysuser.conf "$pkgdir/usr/lib/sysusers.d/$pkgname.conf" + install -vDm0644 tmpfile.conf "$pkgdir/usr/lib/tmpfiles.d/$pkgname.conf" } +sha256sums=( + '957a018d9e6d169fd54b7109bab747309cf72fe0072b54d11d174675da526126' + 'SKIP' 'SKIP' # Skip to my lou +) +b2sums=( + '9390cfd343449160f6c9e244e75af539b73a4ba468e9c3ddf4bc21423e79c6d4d2905b8be829ad0232be00e63f47881d34cf571c9d480b95228df732c32bb7fe' + 'SKIP' 'SKIP' # Skip to my lou +) + # eof diff --git a/mlmmj-1.3.0-bash.diff b/mlmmj-1.3.0-bash.diff deleted file mode 100644 index 5276ce4374f7..000000000000 --- a/mlmmj-1.3.0-bash.diff +++ /dev/null @@ -1,149 +0,0 @@ -diff --git a/src/mlmmj-make-ml.in b/src/mlmmj-make-ml.in -index a6e10a3..e4ee4c6 100755 ---- a/src/mlmmj-make-ml.in -+++ b/src/mlmmj-make-ml.in -@@ -1,9 +1,9 @@ --#!/bin/sh -+#!/usr/bin/bash - # - # mlmmj-make-ml - henne@hennevogel.de - # - --VERSION="0.1" -+VERSION="0.1-bash" - DEFAULTDIR="/var/spool/mlmmj" - ALIASFILE=/etc/aliases - -@@ -20,7 +20,7 @@ $0 - - while getopts ":hL:s:azc:" Option - do --case "$Option" in -+case "$Option" in - h ) - echo "$USAGE" - exit 0 -@@ -59,7 +59,7 @@ echo "Creating Directorys below $SPOOLDIR. Use '-s spooldir' to change" - - if [ -z "$LISTNAME" ]; then - echo -n "What should the name of the Mailinglist be? [mlmmj-test] : " -- read LISTNAME -+ read -r LISTNAME - if [ -z "$LISTNAME" ]; then - LISTNAME="mlmmj-test" - fi -@@ -67,32 +67,32 @@ fi - - LISTDIR="$SPOOLDIR/$LISTNAME" - --mkdir -p $LISTDIR -+mkdir -p "$LISTDIR" - - for DIR in incoming queue queue/discarded archive text subconf unsubconf \ - bounce control moderation subscribers.d digesters.d requeue \ - nomailsubs.d - do -- mkdir "$LISTDIR"/"$DIR" -+ mkdir "$LISTDIR/$DIR" - done - - test -f "$LISTDIR"/index || touch "$LISTDIR"/index - - echo -n "The Domain for the List? [] : " --read FQDN -+read -r FQDN - if [ -z "$FQDN" ]; then -- FQDN=`domainname -f` -+ FQDN=$(domainname -f) - fi - - echo -n "The emailaddress of the list owner? [postmaster] : " --read OWNER -+read -r OWNER - if [ -z "$OWNER" ]; then - OWNER="postmaster" - fi --echo "$OWNER" > "$LISTDIR"/"control/owner" -+echo "$OWNER" > "$LISTDIR/control/owner" - - ( -- cd "@textlibdir@" -+ cd "@textlibdir@" || exit 1 - echo - echo "For the list texts you can choose between the following languages or" - echo "give a absolute path to a directory containing the texts." -@@ -102,7 +102,7 @@ echo "$OWNER" > "$LISTDIR"/"control/owner" - - TEXTPATHDEF=en - echo -n "The path to texts for the list? [$TEXTPATHDEF] : " -- read TEXTPATHIN -+ read -r TEXTPATHIN - if [ -z "$TEXTPATHIN" ] ; then - TEXTPATH="$TEXTPATHDEF" - else -@@ -115,35 +115,35 @@ echo "$OWNER" > "$LISTDIR"/"control/owner" - echo "in the source distribution of mlmmj." - sleep 2 - else -- cp "$TEXTPATH"/* "$LISTDIR"/"text" -+ cp "$TEXTPATH"/* "$LISTDIR/text" - fi - ) - - LISTADDRESS="$LISTNAME@$FQDN" --echo "$LISTADDRESS" > "$LISTDIR"/control/"listaddress" -+echo "$LISTADDRESS" > "$LISTDIR/control/listaddress" - --MLMMJRECEIVE=`which mlmmj-receive 2>/dev/null` -+MLMMJRECEIVE=$(which mlmmj-receive 2>/dev/null) - if [ -z "$MLMMJRECEIVE" ]; then - MLMMJRECEIVE="/path/to/mlmmj-receive" - fi - --MLMMJMAINTD=`which mlmmj-maintd 2>/dev/null` -+MLMMJMAINTD=$(which mlmmj-maintd 2>/dev/null) - if [ -z "$MLMMJMAINTD" ]; then - MLMMJMAINTD="/path/to/mlmmj-maintd" - fi - - ALIAS="$LISTNAME: \"|$MLMMJRECEIVE -L $SPOOLDIR/$LISTNAME/\"" --CRONENTRY="0 */2 * * * \"$MLMMJMAINTD -F -L $SPOOLDIR/$LISTNAME/\"" -+CRONENTRY="0 */2 * * * $MLMMJMAINTD -F -L $SPOOLDIR/$LISTNAME/" - - if [ -n "$A_CREATE" ]; then - echo "I want to add the following to your $ALIASFILE file:" - echo "$ALIAS" - - echo -n "is this ok? [y/N] : " -- read OKIDOKI -- case $OKIDOKI in -+ read -r OKIDOKI -+ case "$OKIDOKI" in - y|Y) -- echo "$ALIAS" >> $ALIASFILE -+ echo "$ALIAS" >> "$ALIASFILE" - ;; - n|N) - exit 0 -@@ -160,10 +160,10 @@ fi - if [ "$DO_CHOWN" ] ; then - echo - echo -n "chown -R $CHOWN $SPOOLDIR/$LISTNAME? [y/n]: " -- read OKIDOKI -- case $OKIDOKI in -+ read -r OKIDOKI -+ case "$OKIDOKI" in - y|Y) -- chown -R $CHOWN $SPOOLDIR/$LISTNAME -+ chown -R "$CHOWN" "$SPOOLDIR/$LISTNAME" - ;; - n|N) - exit 0 -@@ -181,6 +181,6 @@ echo "$CRONENTRY" - - echo - echo " ** FINAL NOTES ** --1) The mailinglist directory have to be owned by the user running the -+1) The mailinglist directory have to be owned by the user running the - mailserver (i.e. starting the binaries to work the list) - 2) Run newaliases" diff --git a/mlmmj-1.3.0.diff b/mlmmj-1.3.0.diff deleted file mode 100644 index 4501d443cdf3..000000000000 --- a/mlmmj-1.3.0.diff +++ /dev/null @@ -1,20 +0,0 @@ ---- 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); - |