diff options
author | Giovanni Harting | 2024-03-23 18:17:03 +0100 |
---|---|---|
committer | Giovanni Harting | 2024-03-23 18:17:03 +0100 |
commit | 3e748eddd1dd32e6d487b6d78be8610d87cc54b5 (patch) | |
tree | cdc9abd167345164e964fcfd3d3114a473d9d573 | |
parent | 52540b8cdfd2dbf7b9252c8f636276193d7f0612 (diff) | |
download | aur-3e748eddd1dd32e6d487b6d78be8610d87cc54b5.tar.gz |
upgpkg: eggdrop 1.9.3-1
upstream release
drop old patches; formatting
-rw-r--r-- | .SRCINFO | 16 | ||||
-rw-r--r-- | PKGBUILD | 85 | ||||
-rw-r--r-- | dlopen.c | 28 | ||||
-rw-r--r-- | utf8.patch | 12 |
4 files changed, 35 insertions, 106 deletions
@@ -1,22 +1,20 @@ pkgbase = eggdrop - pkgdesc = The world's most popular Open Source IRC bot. + pkgdesc = The world's most popular Open Source IRC bot pkgver = 1.9.3 pkgrel = 1 - url = http://www.eggheads.org/ + url = https://www.eggheads.org/ arch = x86_64 - license = GPL2 + license = GPL-2.0-only depends = tcl depends = openssl depends = bash + depends = glibc + depends = zlib backup = etc/eggdrop.conf - source = http://ftp.eggheads.org/pub/eggdrop/source/1.9/eggdrop-1.9.3.tar.gz - source = http://ftp.eggheads.org/pub/eggdrop/source/1.9/eggdrop-1.9.3.tar.gz.asc - source = dlopen.c - source = utf8.patch + source = https://ftp.eggheads.org/pub/eggdrop/source/1.9/eggdrop-1.9.3.tar.gz + source = https://ftp.eggheads.org/pub/eggdrop/source/1.9/eggdrop-1.9.3.tar.gz.asc validpgpkeys = E01C240484DE7DBE190FE141E7667DE1D1A39AFF b2sums = 979190536c3c0718ef4b030d8f6df817b8ee823854c104b7d6f9009c10a7f8394d59afca40fc5c9778f130788fac7e14458d62d30a55413dea4653ca00c83f0a b2sums = SKIP - b2sums = 7aa626e67793815e8fb5957ce706c7d4807671d780267cbde3f03ce1f1f4b2c35282c921b669c955b6b17fef81b966db5e70cb82fc7095c10d6a5c7e625ee8cd - b2sums = 5df161e9f90f54b1ee2e12bbe06d74d01b26e6c35cca9d12225e448874c7ba9c4c571df6c84e968483acc3a22d5259b2cc9519dda626b025577309b4952a3d1c pkgname = eggdrop @@ -7,40 +7,24 @@ pkgname=eggdrop pkgver=1.9.3 pkgrel=1 -pkgdesc="The world's most popular Open Source IRC bot." +pkgdesc="The world's most popular Open Source IRC bot" arch=(x86_64) -url="http://www.eggheads.org/" -license=(GPL2) -depends=(tcl openssl bash) +url=https://www.eggheads.org/ +license=(GPL-2.0-only) +depends=(tcl openssl bash glibc zlib) source=( - "http://ftp.eggheads.org/pub/$pkgname/source/1.9/$pkgname-$pkgver.tar.gz" - "http://ftp.eggheads.org/pub/$pkgname/source/1.9/$pkgname-$pkgver.tar.gz.asc" - 'dlopen.c' - 'utf8.patch' + "https://ftp.eggheads.org/pub/$pkgname/source/1.9/$pkgname-$pkgver.tar.gz" + "https://ftp.eggheads.org/pub/$pkgname/source/1.9/$pkgname-$pkgver.tar.gz.asc" ) backup=("etc/$pkgname.conf") b2sums=('979190536c3c0718ef4b030d8f6df817b8ee823854c104b7d6f9009c10a7f8394d59afca40fc5c9778f130788fac7e14458d62d30a55413dea4653ca00c83f0a' - 'SKIP' - '7aa626e67793815e8fb5957ce706c7d4807671d780267cbde3f03ce1f1f4b2c35282c921b669c955b6b17fef81b966db5e70cb82fc7095c10d6a5c7e625ee8cd' - '5df161e9f90f54b1ee2e12bbe06d74d01b26e6c35cca9d12225e448874c7ba9c4c571df6c84e968483acc3a22d5259b2cc9519dda626b025577309b4952a3d1c') + 'SKIP') validpgpkeys=('E01C240484DE7DBE190FE141E7667DE1D1A39AFF') -# Want multiple *unique* installations? Change the pkgname, it will just work. -_sharedir="/usr/share" -_modulesdir="/usr/lib/$pkgname" -_scriptsdir="$_sharedir/$pkgname/scripts" -_helpdir="$_sharedir/$pkgname/help" -_bin="/usr/bin/$pkgname" -_mandir="$_sharedir/man/man1" -readonly -a _sharedir _modulesdir _scriptsdir _helpdir _bin _mandir - build() { - cd "$srcdir/$pkgname-$pkgver" - - # UNCOMMENT IF YOU NEED UTF-8 SUPPORT - #patch -p1 < "$srcdir/utf8.patch" + cd $pkgname-$pkgver - # Don't complain about language files on startup. + # don't complain about language files on startup sed -i "s|\"./language\"|\"$_sharedir/$pkgname/language\"|g" src/eggdrop.h ./configure @@ -48,53 +32,40 @@ build() { make } -check() { - cd "$srcdir/$pkgname-$pkgver" - - # If this fails, theres a rather good chance something is broken. - gcc -O2 "$srcdir/dlopen.c" -o dlopen -ldl - - for module in *.so ; do - if ! env LD_PRELOAD='' ./dlopen "${module}" ; then - echo "Sanity check failed: "${module}" cannot be loaded. Proceeding anyway.." - fi - done - - rm dlopen -} - package() { - readonly eggtmp="$pkgdir/tmp" - mkdir -p -m 0755 "$eggtmp" + _tmpinstall="$pkgdir/tmp" + install -dm755 "$_tmpinstall" - cd "$srcdir/$pkgname-$pkgver" - make install DEST="$eggtmp" + cd $pkgname-$pkgver + make install DEST="$_tmpinstall" - find "$eggtmp" -name 'CONTENTS' -exec rm {} + + find "$_tmpinstall" -name 'CONTENTS' -exec rm {} + - mkdir -p -m 0755 "$pkgdir/etc" \ - "$pkgdir/usr/"{bin,lib} \ - "$pkgdir/$_sharedir/"{$pkgname,doc,man/man1} + # install modules + for mod in $(ls "$_tmpinstall/modules-$pkgver/"); do + install -Dm644 "$_tmpinstall/modules-$pkgver/$mod" -t "$pkgdir/usr/lib/$pkgname/" + done - mv "$eggtmp/modules-$pkgver" "$pkgdir/$_modulesdir" - mv "$eggtmp/eggdrop-$pkgver" "$pkgdir/$_bin" - mv "$eggtmp/doc/man1/$pkgname.1" "$pkgdir/$_mandir/$pkgname.1" - rm -r "$eggtmp/doc/man1" - mv "$eggtmp/doc" "$pkgdir/$_sharedir/doc/$pkgname" + install -Dm755 "$_tmpinstall/eggdrop-$pkgver" "$pkgdir/usr/bin/$pkgname" + install -Dm644 "$_tmpinstall/doc/man1/$pkgname.1" "$pkgdir/usr/share/man/man1/$pkgname.1" + rm -r "$_tmpinstall/doc/man1" + install -dm755 "$pkgdir/usr/share/doc/" + cp -r "$_tmpinstall/doc" "$pkgdir/usr/share/doc/$pkgname" + install -dm755 "$pkgdir/usr/share/$pkgname" for d in language scripts help text; do - mv "$eggtmp/${d}" "$pkgdir/$_sharedir/$pkgname" + cp -r "$_tmpinstall/${d}" -t "$pkgdir/usr/share/$pkgname/" done + install -dm755 "$pkgdir/etc" sed -e '2d' \ -e "1s@^.*@#!$_bin@" \ -e "s@scripts/@$_scriptsdir/@g" \ -e "s@help/@$_helpdir@g" \ -e "s@modules/@$_modulesdir/@g" \ - eggdrop.conf > "$pkgdir/etc/$pkgname.conf" + $_tmpinstall/eggdrop.conf > "$pkgdir/etc/$pkgname.conf" - rm -r "$eggtmp" - find "$pkgdir/$_sharedir" -type f -exec chmod 0444 {} + + rm -r "$_tmpinstall" } # vim:set ts=2 sw=2 et: diff --git a/dlopen.c b/dlopen.c deleted file mode 100644 index 0a96da8ae24b..000000000000 --- a/dlopen.c +++ /dev/null @@ -1,28 +0,0 @@ -#include <dlfcn.h> -#include <stdio.h> -#include <limits.h> -#include <sys/stat.h> -/* Simple program to see if dlopen() would succeed. */ -int main(int argc, char **argv) -{ - int i; - struct stat st; - char buf[PATH_MAX]; - for (i = 1; i < argc; i++) { - if (dlopen(argv[i], RTLD_NOW)) { - fprintf(stdout, "dlopen() of \"%s\" succeeded.\n", - argv[i]); - } else { - snprintf(buf, sizeof(buf), "./%s", argv[i]); - if ((stat(buf, &st) == 0) && dlopen(buf, RTLD_NOW)) { - fprintf(stdout, "dlopen() of \"./%s\" " - "succeeded.\n", argv[i]); - } else { - fprintf(stdout, "dlopen() of \"%s\" failed: " - "%s\n", argv[i], dlerror()); - return 1; - } - } - } - return 0; -} diff --git a/utf8.patch b/utf8.patch deleted file mode 100644 index 385357cd958a..000000000000 --- a/utf8.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Nura e2/src/tcl.c e1/src/tcl.c ---- e2/src/tcl.c 2011-09-10 01:37:53.000000000 +0400 -+++ e1/src/tcl.c 2016-10-08 01:25:00.830082096 +0300 -@@ -863,7 +863,7 @@ - } - - if (encoding == NULL) { -- encoding = "iso8859-1"; -+ encoding = "utf-8"; - } - - Tcl_SetSystemEncoding(NULL, encoding); |