Commit be4e9928 authored by TBK's avatar TBK Committed by Leo

main/eggdrop: upgrade to 1.8.4

parent 936220e3
# Maintainer: Carlo Landmeter <clandmeter@gmail.com>
pkgname=eggdrop
pkgver=1.6.21
pkgrel=2
pkgver=1.8.4
pkgrel=0
pkgdesc="World's most popular Open Source IRC bot"
url="http://www.eggheads.org/"
url="https://eggheads.org/"
arch="all"
license='GPL2'
license='GPL-2.0-or-later'
options="!check" # No test suite
depends="tcl"
makedepends="tcl-dev !bind-libs"
install=
makedepends="openssl-dev tcl-dev !bind-libs"
subpackages="$pkgname-doc $pkgname-logs2html $pkgname-gseen"
source="ftp://ftp.eggheads.org/pub/eggdrop/GNU/1.6/${pkgname}${pkgver}.tar.bz2
source="$pkgname-$pkgver.tar.gz::https://github.com/eggheads/eggdrop/archive/v$pkgver.tar.gz
eggdrop-langdir.patch
gseen.mod.patch
logs2html.mod.patch
fix-inline-functions.patch"
_builddir="$srcdir/${pkgname}${pkgver}"
prepare() {
cd "$_builddir"
update_config_sub || return 1
for i in $source; do
case $i in
*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
esac
done
}
gseen.mod.patch
utf8.patch
"
build() {
cd "$_builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
--prefix=/usr \
--with-tcllib=/usr/lib/libtcl8.6.so \
--with-tclinc=/usr/include/tcl.h \
|| return 1
make config || return 1
make -j1 || return 1
--with-tclinc=/usr/include/tcl.h
make config
make
}
package() {
cd "$_builddir"
make -j1 INSTALL="install -p" DEST="$pkgdir"/usr/share/eggdrop install \
|| return 1
# workaround for borked Makefile
mkdir -p "$pkgdir"/usr/share/eggdrop/doc \
"$pkgdir"/usr/share/eggdrop/scripts \
"$pkgdir"/usr/share/eggdrop/help/set/
make DEST="$pkgdir"/usr/share/eggdrop install
rm -rf "$pkgdir"/usr/share/eggdrop/README \
"$pkgdir"/usr/share/eggdrop/doc \
"$pkgdir"/usr/share/eggdrop/eggdrop* \
"$pkgdir"/usr/share/eggdrop/filesys \
"$pkgdir"/usr/share/eggdrop/logs \
"$pkgdir"/usr/share/eggdrop/modules \
"$pkgdir"/usr/share/eggdrop/scripts/CONTENTS \
|| return 1
install -D -m 755 eggdrop "$pkgdir"/usr/bin/eggdrop || return 1
"$pkgdir"/usr/share/eggdrop/scripts/CONTENTS
install -D -m 755 eggdrop "$pkgdir"/usr/bin/eggdrop
install -D -m 644 doc/man1/eggdrop.1 \
"$pkgdir"/usr/share/man/man1/eggdrop.1 || return 1
"$pkgdir"/usr/share/man/man1/eggdrop.1
#move modules to /usr/lib
mkdir "$pkgdir"/usr/lib
mv "$pkgdir"/usr/share/eggdrop/modules-* \
"$pkgdir"/usr/lib/eggdrop || return 1
"$pkgdir"/usr/lib/eggdrop
# Fix paths of example eggdrop.conf
......@@ -72,7 +62,7 @@ package() {
mkdir -p "$pkgdir"/usr/share/doc/eggdrop
cp -a \
COPYING FEATURES NEWS README doc/Changes1.6 eggdrop.conf \
COPYING FEATURES NEWS README doc/Changes1.8 eggdrop.conf \
doc/ABOUT doc/BANS doc/BOTNET doc/BUG-REPORT doc/FIRST-SCRIPT \
doc/MODULES doc/PARTYLINE doc/TEXT-SUBSTITUTIONS doc/TRICKS \
doc/USERS doc/WEIRD-MESSAGES doc/tcl-commands.doc doc/settings \
......@@ -83,44 +73,41 @@ package() {
logs2html() {
pkgdesc="logs2html module for eggdrop"
install=""
cd "$_builddir"
cd "$builddir"
for dir in language help; do
mkdir -p "$subpkgdir"/usr/share/eggdrop/$dir
mv "$pkgdir"/usr/share/eggdrop/$dir/logs2html.* "$subpkgdir"/usr/share/eggdrop/$dir/ || return 1
mv "$pkgdir"/usr/share/eggdrop/$dir/logs2html.* "$subpkgdir"/usr/share/eggdrop/$dir/
done
mkdir -p "$subpkgdir"/usr/lib/eggdrop
mv "$pkgdir"/usr/lib/eggdrop/logs2html.so \
"$subpkgdir"/usr/lib/eggdrop/ || return 1
"$subpkgdir"/usr/lib/eggdrop/
mkdir -p "$subpkgdir"/usr/share/eggdrop/log2html
for files in logs2html.conf top100.tpl user.css readme.txt chan.list; do
cp src/mod/logs2html.mod/${files} "$subpkgdir"/usr/share/eggdrop/log2html/ || return 1
for files in logs2html.conf user.css readme.txt; do
cp src/mod/logs2html.mod/$files "$subpkgdir"/usr/share/eggdrop/log2html/
done
}
gseen() {
pkgdesc="gseen module for eggdrop"
install=""
cd "$_builddir"
cd "$builddir"
mkdir -p "$subpkgdir"/usr/share/eggdrop/language
mv "$pkgdir"/usr/share/eggdrop/language/gseen.* \
"$subpkgdir"/usr/share/eggdrop/language/ || return 1
"$subpkgdir"/usr/share/eggdrop/language/
mkdir -p "$subpkgdir"/usr/lib/eggdrop
mv "$pkgdir"/usr/lib/eggdrop/gseen.so \
"$subpkgdir"/usr/lib/eggdrop/ || return 1
"$subpkgdir"/usr/lib/eggdrop/
mkdir -p "$subpkgdir"/usr/share/eggdrop/gseen
cp src/mod/gseen.mod/gseen.conf "$subpkgdir"/usr/share/eggdrop/gseen/ \
|| return 1
cp src/mod/gseen.mod/README "$subpkgdir"/usr/share/eggdrop/gseen/ \
|| return 1
cp src/mod/gseen.mod/gseen.conf "$subpkgdir"/usr/share/eggdrop/gseen/
cp src/mod/gseen.mod/README "$subpkgdir"/usr/share/eggdrop/gseen/
}
sha512sums="9fd9a86c1c4b59a47a5eed4e2306e829a01bac2ad29e990ca9c0ec630d5814fd649a9216dae9ce49f734e3ac1728beb4f479ca10af583bd513f43bbbea23a653 eggdrop1.6.21.tar.bz2
e8b36fb3c444bd884def46082f2c4f0683d1ba8bf05015344e1a2cf634955c8f1e8ccef62c3c2d93958151cf2ce1595adc352c0de3c76ceed7b89c28f48ea96f eggdrop-langdir.patch
b7bc853b73a9a86ed19dae2cb9edaededbeaa0c163034dc8106239818b8d1fb7c7381fa933fda786cb1c5026283821ec6e3a85a1bbc73db736668f1615dfe2f7 gseen.mod.patch
8380c414d5193f7a48b5b91384c0181b472dd6cd541a3e9921453b945af3a959d6f58e6bfdcc311ba7b1ed15a44b2225c1d0f1a00526da75cacd4b8650591229 logs2html.mod.patch
bbe12761c35298604ffeb90a1dfb1c928fa7b83e6366578e8f1b298dda72dea19931812c70b6f9475b7b0449b0e799fd9cbee52e8d40be04eb33484274589340 fix-inline-functions.patch"
sha512sums="80239a015f518cadc251bfc5edcf08715b9200a70eb0df7edf0efc113f320a7e407ab1fee96322fc6ec923781aa94f5a947c458e935e8a3714fb86cbcc02cb04 eggdrop-1.8.4.tar.gz
d8e8655fed028030bc3cfe28207a289d0efbc412c7e01170a4d0bb31200f7ea93df310f19e83b485013ca5d4264694b4956252663cb3a63c3d5e4cc31346e0fe eggdrop-langdir.patch
be173d94a953c4dc5b178950d06ce894deda60c3ddb8195c836797d45fbbcc9fba3bc3d3f34c96226464fdd327093a5d15bbc2b7924d18f845738c1a4dd64a3b logs2html.mod.patch
7879b998880deb1943c41569e243f9f1a50df23982d82d942af6c111e7fac0fb8a8444c84980645ba15b71dd69c8db2dab6f90bcb7a4292306011c7bcfc03d0d gseen.mod.patch
7966d4d42994e44a0e571b89f1c66cb41f672d75e6ced7051d1ece23d8c209059c3565b41de950bf9c907701ce7a5e33a215b637587075ed300a002a58eda503 utf8.patch"
......@@ -4,7 +4,7 @@ EGG_LANGDIR environment variable per default (#194481 #c6-c9).
--- eggdrop1.6.17/src/eggdrop.h 2004-07-25 13:17:34.000000000 +0200
+++ eggdrop1.6.17/src/eggdrop.h.langdir 2006-06-18 01:19:23.000000000 +0200
@@ -75,7 +75,7 @@
@@ -63,7 +63,7 @@
/* Language stuff */
......
Description: fix inline functions to build with clang-3.5. See
http://clang.llvm.org/compatibility.html#inline
Author: Arthur Marble <arthur@info9.net>
--- a/src/match.c
+++ b/src/match.c
@@ -367,7 +367,7 @@
/* Inline for cron_match (obviously).
* Matches a single field of a crontab expression.
*/
-inline int cron_matchfld(char *mask, int match)
+static inline int cron_matchfld(char *mask, int match)
{
int skip = 0, f, t;
char *p, *q;
--- a/src/tclhash.c
+++ b/src/tclhash.c
@@ -109,7 +109,7 @@
nfree(tl);
}
-inline void garbage_collect_tclhash(void)
+void garbage_collect_tclhash(void)
{
tcl_bind_list_t *tl, *tl_next, *tl_prev;
tcl_bind_mask_t *tm, *tm_next, *tm_prev;
--- a/src/tclhash.h
+++ b/src/tclhash.h
@@ -75,7 +75,7 @@
#ifndef MAKING_MODS
-inline void garbage_collect_tclhash(void);
+void garbage_collect_tclhash(void);
void init_bind(void);
void kill_bind(void);
--- a/src/net.c
+++ b/src/net.c
@@ -564,7 +564,7 @@
/* Returns a socket number for a listening socket that will accept any
* connection -- port # is returned in port
*/
-inline int open_listen(int *port)
+int open_listen(int *port)
{
return open_address_listen(myip[0] ? getmyip() : INADDR_ANY, port);
}
--- a/src/proto.h
+++ b/src/proto.h
@@ -271,7 +271,7 @@
void killsock(int);
void killtclsock(int);
int answer(int, char *, unsigned long *, unsigned short *, int);
-inline int open_listen(int *);
+int open_listen(int *);
int open_address_listen(IP addr, int *);
int open_telnet(char *, int);
int open_telnet_dcc(int, char *, char *);
--- a/src/userrec.c
+++ b/src/userrec.c
@@ -77,7 +77,7 @@
#endif
}
-inline int expmem_mask(struct maskrec *m)
+static inline int expmem_mask(struct maskrec *m)
{
int result = 0;
This diff is collapsed.
This diff is collapsed.
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);
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment