diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2017-10-09 18:53:29 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2017-10-09 18:53:29 +0100 |
commit | 4f2d7949f03e1c198bc888f2d05f421d35c57e21 (patch) | |
tree | ba5f07bf3f9d22d82e54a462313f5d244036c768 /net-irc/ircservices |
reinit the tree, so we can have metadata
Diffstat (limited to 'net-irc/ircservices')
12 files changed, 499 insertions, 0 deletions
diff --git a/net-irc/ircservices/Manifest b/net-irc/ircservices/Manifest new file mode 100644 index 000000000000..172cc5366bbb --- /dev/null +++ b/net-irc/ircservices/Manifest @@ -0,0 +1,14 @@ +AUX ircservices-5.1.17-fPIC-configure.patch 778 SHA256 b94e19034a85a96964ea659716278545dc77c7644e1c5a758dae66d5c9e538c2 SHA512 cfa49ed7572dd78b04d0b39b6927c8d3d9aff2b2d9b3367a9b5daba499070e2e844ae86b5496ebd31acd86b43b7278e404e14611ec042337ed332e62c3c4fbe1 WHIRLPOOL db4c8049019bed9a814f8031ccab9df849bd02dccb541dfa03578b2622985ef568c0dc138d4344ea2b7e3a8e5dd1aeb6085eab34250c72d4258fa39d96d8f837 +AUX ircservices-5.1.17-fPIC.patch 622 SHA256 af5f1472b5c9b1e9ff50f4ade87f6a8e8784addaeb356fddce81f74cffad0f91 SHA512 2dc91b88313aaa2e98518bbc172255e68532d9358a9c8789733cd6949f7a634a55980e0e4bcc4762b2efd9d7b0053ee763fff22aab0170c7cc0d0213bfd6ac8c WHIRLPOOL d3a9adc0bf7f1a93a47085da873c13630d85aed7c00019d0c297ad8b81cf4d726e5d6305602a77aeb15a2fba131daef3d6af4469affc7605aebbecf2e9e3f37d +AUX ircservices-5.1.24-as-needed.patch 668 SHA256 267c455715797c0f8d939512813f547171fa03c737d77b399e43ef503252d50b SHA512 6f8306b77a8550ca55c47495ab660be2fd780883757e84e705ad5b458eb31bcba69dd7a609cdc6921de3d8f7a3703fc5ac73d927d86402c2db1c4f632cbe6cb8 WHIRLPOOL bb701e99299ed341f92ff4d0a375c3a30ae5e46f2e8d94a27406d7c34d982bcda3998ec7e0ecafdeb1af386c76eb199176d25caea944365a51301cb0c65e940c +AUX ircservices-5.1.24-fd_set-amd64.patch 9361 SHA256 f20cc762bd575b898136f0bc638ba2c5490ab42b2a2e6963568a1ca9d099a3f4 SHA512 f6145a161517f7c44e7cdecf28a17ac07239542c83af9c8d040de14021678aeabc8d9fc2f750dabfd64a4003f8085bda31ec91bfd7b8008941fe94cbd8facaab WHIRLPOOL 7a43561e46349593d7dd80bd4f518a0816e0f94212cc48590a8e4640b4dd89276cc29fa63889e002ee90dffac8481b28bed5139dee0c74ef81e806572be20752 +AUX ircservices-5.1.24-ircservices-chk-pidfile.patch 562 SHA256 f85d1ba2193713bd4ee396f4f9d51c4806bea536c7224115ce505f08750e43be SHA512 eefc97232257db5d0a0488e3fe47097f41a05252109bb585fcaf3b066e74aae9bfb74dfe21803b2c105424790ad694cf42123fa281482c8b227704b50b5b0414 WHIRLPOOL d9e394ac147c3c3eb567a3abbd94a4b524add57683c03aa1ff177c3583a1a56b819df7eedc24e74d28e1ff00745b01dd2d6b8fddc9c0bab85bc6a4fb4a5fbf1d +AUX ircservices-5.1.24-ldflags.patch 479 SHA256 1798dac8bf78ceccf24874cecf331d8f6d605a152c5eec75557b69938029c06e SHA512 0985375bd4b775e37cd7f60c750d23318b8dd238114f363f5c970e3b56af982bd4a6f0e7f85366327e037996440578aa8549e15d46a65098266007a40648f3fd WHIRLPOOL d2bc5a27e50b85548ff7cbcd0d6fe6348f13576a5acfdbf44eb303b3876a60dbaf786d9522d6f3fc8502ebff8936071dc9b17f6aceb256240d52b4b9fb99fb03 +AUX ircservices-5.1.24-parallel-make.patch 736 SHA256 54104cc06087db860e1933363071fa7077a914eaf7efbaeea001e611182af6ce SHA512 e312fbf3d621c9fe6223a005c352c5bbb1904c2c04cfa0691c2a573f9d7691ddcce616c4103512066731bb5ec71bf4beaf15f01920c6d5f34b78ebd23a4d8c16 WHIRLPOOL 3517a12b308bfeeeb0f57bc08e5b15a51c22b728935a5689cbd32147c84b754987223c0902048388bdc372f4e7e6a4c5be02000f7cad35f9cf19fa815da87f7e +AUX ircservices.confd 487 SHA256 cbbd130e360f6d4191baf99d3943f3a5e09f32b016f94803660365879e0c02b7 SHA512 2c126ead7e2e85e8db5097085b4baa7dc0ee18cf0db7428184977d593353f072cabe6769cd07b5cb6bba85d1fb3852c7d7e0c5604102d2e0cd33557d2de6c99d WHIRLPOOL 4f98f05e29a8e53023a552b39e2f17860b438d4d5225a2096bed61cbcf07a9b6e76015998b540b39f392ecb8ab23d5da66158df79d78e5d9616c5d49ed9352d0 +AUX ircservices.initd 759 SHA256 6d9243180f75440737dbc20f1f161667a427ea1088396e4c8215e103f75b7e3a SHA512 cee224e3ba727ef9141e8fda744b4dd488c4603db44c12c5e405d8de2d39f6e6e5e0829b4353a651c5ca9bb23e5ca00188178e7ed6e20d69e2767ef38eb40243 WHIRLPOOL ce11b5bb0790c50d2c3a96481a916f817bf0cb4a770316ff75cdab7e02a2dc5fec883a73e1db8c46de0368670f1ae425a931556dea8bd826b5364c20bedb2dc7 +DIST ircservices-5.1.24.tar.gz 1516612 SHA256 63c88b84ddcd12f3636ca9c69987a06e4055156ae3ebe2ff4f22205c66c2a365 SHA512 1c1a0ec6d0e0a11071532e07792a15b1910fe108f09e991ca27e0196cfeec72e057a067fa69396b8647aca4ed8097c857eb8e714d8bee2ca6a0c5e27593fb06d WHIRLPOOL f8a3fdfb888030d4fd7426e4270a424dc651ef8e5b7e4f030ed0cb882f3911f2f96909eefcb5f65d1d69ced305538ae0ecc575fc3b4f9d558ab56946a42f8f52 +EBUILD ircservices-5.1.24.ebuild 3145 SHA256 d1988b05cee269da579a51920ca9ea98b7c08068d2801dbb188691e85e901c5e SHA512 8dab875a6c4d7ae2a8bac6a8fab348b5d4e7ce320325c6765950198f533d5a5010bb34af1a7fe739b77f248fb553466dcefa3093ad63446eb67fe87367b47a0b WHIRLPOOL d33e8996653839b57bb88404433d6566d36d5e20a91a66e7552e407b7e6943a622d278810db019a75e8e4fc2f3d6978f3c5921b0098ea55c1346011bc5616c86 +MISC ChangeLog 3108 SHA256 73f4446d8291cb2833d21a38cc841f477a6637d4d6844c8c88b1e339a18d7ef1 SHA512 5a8df8214726ebb7e1058fa1cc34c2b8f393e8d6581a251c66e2e1884acc146c3464789bf820c1c3202ab208fe467fa396ffe0690d28a9e02b85f6a87c1f7d4b WHIRLPOOL 30e2a03abfdf66657c36c4e6acbe5d27ab57b0951a33e29390ef0f8f4100209b583bf760373fcde36caac85ebfb88870b856a42acbc66ed2a5ef0e01466a4b23 +MISC ChangeLog-2015 9015 SHA256 bffc3d43cdd6fbeda71d981eec4d9e8dcd98979136cfc4a57c968ca0a5eae1df SHA512 d72b9281ebb44f6ad557acd0ea10435fd43956597db26302f42640b14f4554165950913881a38dd366125dc94ea60a458913b06cc7fcda0d09aec208ef240bce WHIRLPOOL 5ccd03fee2576a410a24d380ae6632526358ff8e76a43d6dcfe1d55d61c3a34c1aa7910b184c041f65dfd9b28fec68c0179b5a5a2f3ab7eb0369d977e6b76716 +MISC metadata.xml 259 SHA256 43367eee3fde3abfd32059666a5e056dc46e3558cdb2fff9491c80f15436f4ee SHA512 35da36c4a432db521f3a3747f4e047d807d3943ee80e9b5f4dc5ab4d341c52d24f4f1f0d622c77e405b5ad96a63904f5662dab4cb191d85388061fdd70737b4d WHIRLPOOL 437e103e1f9ed95441635738663f74ed58336ed273757d5e674e0b648ba86c8fbd538add9c4e0d57fb94a5478fea24cc1991a5d6a2abc3f32ad418d60e8789f4 diff --git a/net-irc/ircservices/files/ircservices-5.1.17-fPIC-configure.patch b/net-irc/ircservices/files/ircservices-5.1.17-fPIC-configure.patch new file mode 100644 index 000000000000..8e279031b2e0 --- /dev/null +++ b/net-irc/ircservices/files/ircservices-5.1.17-fPIC-configure.patch @@ -0,0 +1,14 @@ +--- ircservices-5.1.12/configure 2008-09-22 17:35:52.000000000 +0000 ++++ ircservices-5.1.12.orig/configure 2008-09-22 17:33:51.000000000 +0000 +@@ -1296,9 +1296,9 @@ + fi + if [ "$OK" ] ; then + if [ "x`uname -s`" = "xOSF1" ] ; then +- CC_SHARED="$CC -shared -Wl,-expect_unresolved" ++ CC_SHARED="$CC -shared -Wl,-expect_unresolved -fPIC" + else +- CC_SHARED="$CC -shared" ++ CC_SHARED="$CC -shared -fPIC" + fi + if run $CC_SHARED $CC_FLAGS $CC_LIBS $CONFTMP/test-lib.c -o $CONFTMP/test-lib.so && run $CC_SHARED $CC_FLAGS $CC_LIBS $CONFTMP/test-lib2.c -o $CONFTMP/test-lib2.so ; then + log "-shared works" diff --git a/net-irc/ircservices/files/ircservices-5.1.17-fPIC.patch b/net-irc/ircservices/files/ircservices-5.1.17-fPIC.patch new file mode 100644 index 000000000000..788723c5be00 --- /dev/null +++ b/net-irc/ircservices/files/ircservices-5.1.17-fPIC.patch @@ -0,0 +1,12 @@ +diff -Nur ircservices-5.1.12/modules/Makerules ircservices-5.1.12.orig/modules/Makerules +--- ircservices-5.1.12/modules/Makerules 2008-09-22 17:37:48.000000000 +0000 ++++ ircservices-5.1.12.orig/modules/Makerules 2008-09-22 17:33:51.000000000 +0000 +@@ -172,7 +172,7 @@ + $(TARGET).o: .compiled-$(TARGET).o FRC + @echo >/dev/null + .compiled-$(TARGET).o: $(TARGET).c $(DEPS) $(INCLUDES2) +- cd $(TOPDIR) && $(CC) $(CFLAGS) -I. -c modules/$(DIRNAME)/$< -o modules/$(DIRNAME)/$(TARGET).o ++ cd $(TOPDIR) && $(CC) $(CFLAGS) -fPIC -I. -c modules/$(DIRNAME)/$< -o modules/$(DIRNAME)/$(TARGET).o + @rm -f $@ + @ln -s $(TARGET).o $@ + diff --git a/net-irc/ircservices/files/ircservices-5.1.24-as-needed.patch b/net-irc/ircservices/files/ircservices-5.1.24-as-needed.patch new file mode 100644 index 000000000000..b8b3668e1e39 --- /dev/null +++ b/net-irc/ircservices/files/ircservices-5.1.24-as-needed.patch @@ -0,0 +1,17 @@ +From: Nathan Phillip Brink <binki@gentoo.org> +Date: 2011-06-22 +Subject: Fix missing $(LIBS) in the Makefiles where linking of modules + happens. + +diff -r 7c815ad6fa2e -r f195c349225a modules/Makerules +--- a/modules/Makerules Wed Jun 22 00:14:22 2011 -0400 ++++ b/modules/Makerules Wed Jun 22 13:32:24 2011 -0400 +@@ -104,7 +104,7 @@ + + # Compile one or more objects into a dynamic module. + $(TARGET).so: $(TARGET).o $(OBJECTS) +- $(CC_SHARED) $(CFLAGS) $(LFLAGS) $^ -o $@ ++ $(CC_SHARED) $(CFLAGS) $(LFLAGS) $^ -o $@ $(LIBS) + + # Compile one or more objects into a static module and generate a symbol + # list. The .a file we create here is just a placeholder to show that diff --git a/net-irc/ircservices/files/ircservices-5.1.24-fd_set-amd64.patch b/net-irc/ircservices/files/ircservices-5.1.24-fd_set-amd64.patch new file mode 100644 index 000000000000..b15595d570a3 --- /dev/null +++ b/net-irc/ircservices/files/ircservices-5.1.24-fd_set-amd64.patch @@ -0,0 +1,236 @@ +From: Nathan Phillip Brink <binki@gentoo.org> +Subject: Fix compilation on amd64 platform by using a different method + of fixing the printf() + size_t problem. + +The method used is to test if the `z' printf integer modifier works or +not. If that works, use it. Otherwise, search for a normal integer +type of similar length to size_t. Defines PRIdSIZE and PRIuSIZE in +reminiscence of inttypes.h + +diff -r b323b647fe91 -r e10ae0e7b778 Makefile +--- a/Makefile Tue Jun 21 00:42:59 2011 -0400 ++++ b/Makefile Tue Jun 21 00:44:38 2011 -0400 +@@ -116,17 +116,17 @@ + + ifneq ($(STATIC_MODULES),) + modules: langstrs.h +- @$(MAKE) -C modules all-static CFLAGS="$(CFLAGS)" ++ @$(MAKE) -C modules all-static CFLAGS='$(CFLAGS)' + else + modules: langstrs.h +- @$(MAKE) -C modules all-dynamic CFLAGS="$(CFLAGS)" ++ @$(MAKE) -C modules all-dynamic CFLAGS='$(CFLAGS)' + endif + + languages: +- @$(MAKE) -C lang CFLAGS="$(CFLAGS)" ++ @$(MAKE) -C lang CFLAGS='$(CFLAGS)' + + tools: langstrs.h services.h +- @$(MAKE) -C tools CFLAGS="$(CFLAGS)" ++ @$(MAKE) -C tools CFLAGS='$(CFLAGS)' + + + # Catch any changes in compilation options at the top of this file or the +diff -r b323b647fe91 -r e10ae0e7b778 configure +--- a/configure Tue Jun 21 00:42:59 2011 -0400 ++++ b/configure Tue Jun 21 00:44:38 2011 -0400 +@@ -271,6 +271,7 @@ + SIZEOF_INT= + SIZEOF_LONG= + SIZEOF_PTR= ++SIZEOF_SIZE_T= + SIZEOF_TIME_T= + MAX_TIME_T= + SIZEOF_GID_T=bonkle +@@ -1997,6 +1998,39 @@ + fi + fi + ++MODE="check_size_t " ++echo2 "Checking the size of size_t... " ++if [ "$SIZEOF_SIZE_T" ]; then ++ echo "(cached) `expr $SIZEOF_SIZE_T \* 8` bits" ++ log "cache supplied `expr $SIZEOF_SIZE_T \* 8` bits" ++else ++ cat >$CONFTMP/test.c <<EOT ++ #include <stdlib.h> ++ #include <stdio.h> ++ int main() ++ { ++ size_t a = 0; ++ printf("%d", sizeof(a)); ++ return 0; ++ } ++EOT ++ if run $CC $CC_FLAGS $CONFTMP/test.c $CC_LIBS -o $CONFTMP/test; then ++ a="`$CONFTMP/test`" ++ log "test program output (sizeof(size_t)): $a" ++ if [ ! "$a" ]; then ++ echo "test program failed! Assuming `expr $SIZEOF_PTR \* 8` bits." ++ log "assuming `expr $SIZEOF_PTR \* 8` bits" ++ SIZEOF_SIZE_T=$SIZEOF_PTR ++ else ++ SIZEOF_SIZE_T="$a" ++ echo `expr $SIZEOF_SIZE_T \* 8` bits ++ log "`expr $SIZEOF_SIZE_T \* 8` bits" ++ fi ++ else ++ whoa_there ++ fi ++fi ++ + MODE="check_time_t " + echo2 "Checking the size of time_t... " + if [ "$SIZEOF_TIME_T" -a "$MAX_TIME_T" ] ; then +@@ -2135,6 +2169,53 @@ + fi + fi + ++MODE="check_PRIdSIZE " ++echo2 "Checking how to use size_t with printf... " ++if [ "$SIZE_T_FORMAT" ]; then ++ echo "(cached) $SIZE_T_FORMAT" ++ log "cache $SIZE_T_FORMAT" ++else ++ cat >$CONFTMP/test.c <<EOT ++ #include <stdlib.h> ++ #include <stdio.h> ++ int main() ++ { ++ size_t a = 26; ++ printf("%zu", a); ++ return 0; ++ } ++EOT ++ if run $CC $CC_FLAGS $CONFTMP/test.c $CC_LIBS -o $CONFTMP/test; then ++ a="`$CONFTMP/test`" ++ log "test program output printf(\"%zu\", (size_t)26): $a" ++ if [ "x$a" = "x26" ]; then ++ echo "can use %zu to print size_t (I love standards-compliance :-))." ++ log "can use %zu to print size_t (I love standards-compliance :-))." ++ CDEFS="$CDEFS -DPRIdSIZE=\\\"zd\\\" -DPRIuSIZE=\\\"zu\\\"" ++ else ++ echo "test program indicated that runtime does not accept %zu for size_t." ++ log "test program indicated that runtime does not accept %zu for size_t." ++ if [ "x$SIZEOF_SIZE_T" = "x$SIZEOF_INT" ]; then ++ SIZE_MOD= ++ MATCHED=int ++ else ++ if [ "x$SIZEOF_SIZE_T" = "x$SIZEOF_LONG" ]; then ++ SIZE_MOD=l ++ MATCHED=long ++ else ++ SIZE_MOD=l ++ MATCHED="no known types" ++ fi ++ fi ++ echo "size_t's size matched $MATCHED, using %$SIZE_MOD""d to print size_t." ++ log "size_t's size matched $MATCHED, using %$SIZE_MOD""d to print size_t." ++ CDEFS="$CDEFS -DPRIdSIZE=\\\"$SIZE_MOD""d\\\" -DPRIuSIZE=\\\"$SIZE_MOD""u\\\"" ++ fi ++ else ++ whoa_there ++ fi ++fi ++ + ########################################################################### + + # AIX workaround. +diff -r b323b647fe91 -r e10ae0e7b778 defs.h +--- a/defs.h Tue Jun 21 00:42:59 2011 -0400 ++++ b/defs.h Tue Jun 21 00:44:38 2011 -0400 +@@ -224,11 +224,6 @@ + + /* Various generally useful macros. */ + +- +-/* Make sizeof() return an int regardless of compiler (avoids printf +- * argument type warnings). */ +-#define sizeof(v) ((int)sizeof(v)) +- + /* Length of an array: */ + #define lenof(a) (sizeof(a) / sizeof(*(a))) + +diff -r b323b647fe91 -r e10ae0e7b778 modules/Makefile +--- a/modules/Makefile Tue Jun 21 00:42:59 2011 -0400 ++++ b/modules/Makefile Tue Jun 21 00:44:38 2011 -0400 +@@ -18,7 +18,7 @@ + + all-dynamic: + @set -e ; for i in $(SUBDIRS) ; do \ +- $(MAKE) -C $$i $@ DIRNAME="$$i" CFLAGS="$(CFLAGS)" ; \ ++ $(MAKE) -C $$i $@ DIRNAME="$$i" CFLAGS='$(CFLAGS)' ; \ + if $(TEST_NT) ! -f .stamp -o "$$i/.stamp" -nt .stamp ; then \ + echo "touch .stamp" ; \ + touch .stamp ; \ +@@ -33,7 +33,7 @@ + @echo '#include "modsyms.c"' >>modlist.c + @echo 'struct {const char *name; void *symlist;} modlist[] = {' >>modlist.c + @set -e ; for i in $(SUBDIRS) ; do \ +- $(MAKE) -C $$i $@ DIRNAME="$$i" CFLAGS="$(CFLAGS)" ; \ ++ $(MAKE) -C $$i $@ DIRNAME="$$i" CFLAGS='$(CFLAGS)' ; \ + cat $$i/.modext-*.h >>modext.h ; \ + cat $$i/.modsyms-*.c >>modsyms.c ; \ + cat $$i/.modlist-*.c >>modlist.c ; \ +diff -r b323b647fe91 -r e10ae0e7b778 modules/Makerules +--- a/modules/Makerules Tue Jun 21 00:42:59 2011 -0400 ++++ b/modules/Makerules Tue Jun 21 00:44:38 2011 -0400 +@@ -153,13 +153,13 @@ + $(TARGET).o $(TARGET)_static.o: MODULE_CFLAGS += -DMODULE_MAIN_FILE + $(TARGET)_static.o: MODULE_CFLAGS += -D_this_module_ptr=_this_module_ptr_$(MODULE_ID) -Dmodule_version=module_version_$(MODULE_ID) -Dmodule_config=module_config_$(MODULE_ID) -Dinit_module=init_module_$(MODULE_ID) -Dexit_module=exit_module_$(MODULE_ID) + $(TARGET)_static.o: FRC +- @$(MAKE) --no-print-directory $@ TARGET=$(@:_static.o=) INCLUDES2="$(INCLUDES-$(@:_static.o=.o))" CFLAGS="$(CFLAGS) $(MODULE_CFLAGS)" REALLY_COMPILE=2 ++ @$(MAKE) --no-print-directory $@ TARGET=$(@:_static.o=) INCLUDES2="$(INCLUDES-$(@:_static.o=.o))" CFLAGS='$(CFLAGS) $(MODULE_CFLAGS)' REALLY_COMPILE=2 + @if $(TEST_NT) ! -f .stamp -o "$@" -nt .stamp ; then \ + echo "touch .stamp" ; \ + touch .stamp ; \ + fi + $(TARGET).o $(OBJECTS): FRC +- @$(MAKE) --no-print-directory $@ TARGET=$(@:.o=) INCLUDES2="$(INCLUDES-$@)" CFLAGS="$(CFLAGS) $(MODULE_CFLAGS)" REALLY_COMPILE=2 ++ @$(MAKE) --no-print-directory $@ TARGET=$(@:.o=) INCLUDES2="$(INCLUDES-$@)" CFLAGS='$(CFLAGS) $(MODULE_CFLAGS)' REALLY_COMPILE=2 + @if $(TEST_NT) ! -f .stamp -o "$@" -nt .stamp ; then \ + echo "touch .stamp" ; \ + touch .stamp ; \ +diff -r b323b647fe91 -r e10ae0e7b778 tools/convert-cygnus.c +--- a/tools/convert-cygnus.c Tue Jun 21 00:42:59 2011 -0400 ++++ b/tools/convert-cygnus.c Tue Jun 21 00:44:38 2011 -0400 +@@ -245,7 +245,7 @@ + break; + } + if (strlen(pass) > sizeof(ngi->pass)-1) { +- fprintf(stderr, "%s:%d: Password for `%s' truncated to %d" ++ fprintf(stderr, "%s:%d: Password for `%s' truncated to %" PRIdSIZE + " characters\n", fname, line, ni->nick, + sizeof(ngi->pass)-1); + pass[sizeof(ngi->pass)-1] = 0; +@@ -741,7 +741,7 @@ + } + ci->founder = ni->nickgroup; + if (strlen(pass) > sizeof(ci->founderpass)-1) { +- fprintf(stderr, "%s:%d: Password for `%s' truncated to %d" ++ fprintf(stderr, "%s:%d: Password for `%s' truncated to %" PRIdSIZE + " characters\n", fname, line, ci->name, + sizeof(ci->founderpass)-1); + pass[sizeof(ci->founderpass)-1] = 0; +diff -r b323b647fe91 -r e10ae0e7b778 tools/convert-hybserv.c +--- a/tools/convert-hybserv.c Tue Jun 21 00:42:59 2011 -0400 ++++ b/tools/convert-hybserv.c Tue Jun 21 00:44:38 2011 -0400 +@@ -198,7 +198,7 @@ + exit(1); + } else { + fprintf(stderr, "%s:%d: Password for `%s'" +- " truncated to %d characters\n", fname, ++ " truncated to %" PRIdSIZE " characters\n", fname, + line, ni->nick, + sizeof(ngi->pass.password)-1); + } +@@ -564,7 +564,7 @@ + exit(1); + } else { + fprintf(stderr, "%s:%d: Password for `%s'" +- " truncated to %d characters\n", fname, ++ " truncated to %" PRIdSIZE " characters\n", fname, + line, ci->name, + sizeof(ci->founderpass.password)-1); + } diff --git a/net-irc/ircservices/files/ircservices-5.1.24-ircservices-chk-pidfile.patch b/net-irc/ircservices/files/ircservices-5.1.24-ircservices-chk-pidfile.patch new file mode 100644 index 000000000000..b232e8c5e07a --- /dev/null +++ b/net-irc/ircservices/files/ircservices-5.1.24-ircservices-chk-pidfile.patch @@ -0,0 +1,22 @@ +From: Nathan Phillip Brink <binki@gentoo.org> +Date: 2011/06/15 +Subject: Use the same datadir/pidfile searching algorithm in + ircservices-chk as in ircservices to ensure consistent + results. + +--- a/tools/ircservices-chk.in ++++ b/tools/ircservices-chk.in +@@ -21,10 +21,10 @@ + fi + + ok= +-if [ -f "@DATDEST@/$PIDFILE" ] ; then +- pid=`cat "@DATDEST@/$PIDFILE"` ++if ! cd "@DATDEST@" || [ -f "$PIDFILE" ] ; then ++ pid=`cat "$PIDFILE"` + if echo "0$pid" | grep -q '[^0-9]' ; then +- rm -f "@DATDEST@/$PIDFILE" ++ rm -f "$PIDFILE" + elif kill -0 $pid ; then + ok=1 + fi diff --git a/net-irc/ircservices/files/ircservices-5.1.24-ldflags.patch b/net-irc/ircservices/files/ircservices-5.1.24-ldflags.patch new file mode 100644 index 000000000000..b4041cd74a27 --- /dev/null +++ b/net-irc/ircservices/files/ircservices-5.1.24-ldflags.patch @@ -0,0 +1,12 @@ +diff -r e10ae0e7b778 modules/Makerules +--- a/modules/Makerules Tue Jun 21 00:44:38 2011 -0400 ++++ b/modules/Makerules Tue Jun 21 13:00:07 2011 -0400 +@@ -104,7 +104,7 @@ + + # Compile one or more objects into a dynamic module. + $(TARGET).so: $(TARGET).o $(OBJECTS) +- $(CC_SHARED) $^ -o $@ ++ $(CC_SHARED) $(CFLAGS) $(LFLAGS) $^ -o $@ + + # Compile one or more objects into a static module and generate a symbol + # list. The .a file we create here is just a placeholder to show that diff --git a/net-irc/ircservices/files/ircservices-5.1.24-parallel-make.patch b/net-irc/ircservices/files/ircservices-5.1.24-parallel-make.patch new file mode 100644 index 000000000000..910771adcdc5 --- /dev/null +++ b/net-irc/ircservices/files/ircservices-5.1.24-parallel-make.patch @@ -0,0 +1,28 @@ +From: Nathan Phillip Brink <binki@gentoo.org> +Subject: Fix issues of langstrs.h not being built before modules and + tools are, hopefully fixing parallel make. + +diff -r ad64cfd2cacc -r b323b647fe91 Makefile +--- a/Makefile Mon Jun 20 22:29:07 2011 -0400 ++++ b/Makefile Tue Jun 21 00:42:59 2011 -0400 +@@ -115,17 +115,17 @@ + $(CC) $(LFLAGS) $(OBJS) version.o $(MODLIB) $(LIBS) -o $@ + + ifneq ($(STATIC_MODULES),) +-modules: ++modules: langstrs.h + @$(MAKE) -C modules all-static CFLAGS="$(CFLAGS)" + else +-modules: ++modules: langstrs.h + @$(MAKE) -C modules all-dynamic CFLAGS="$(CFLAGS)" + endif + + languages: + @$(MAKE) -C lang CFLAGS="$(CFLAGS)" + +-tools: services.h ++tools: langstrs.h services.h + @$(MAKE) -C tools CFLAGS="$(CFLAGS)" + + diff --git a/net-irc/ircservices/files/ircservices.confd b/net-irc/ircservices/files/ircservices.confd new file mode 100644 index 000000000000..6d2bc475ca14 --- /dev/null +++ b/net-irc/ircservices/files/ircservices.confd @@ -0,0 +1,11 @@ +# -*- mode: sh; -*- + +# The user which ircservices should be run as. Set to an empty value +# to have ircservices run as the user the initscript is run as (which +# is generally bad practice). +IRCSERVICES_USER=ircservices + +# The location of the pidfile (as written in ircservices.conf). If the +# directory containing the pidfile does not exist, and attempt will be +# made to create that folder and set its owner to IRCSERVICES_USER. +IRCSERVICES_PIDFILE=/var/run/ircservices/ircservices.pid diff --git a/net-irc/ircservices/files/ircservices.initd b/net-irc/ircservices/files/ircservices.initd new file mode 100644 index 000000000000..c938eb0bde8a --- /dev/null +++ b/net-irc/ircservices/files/ircservices.initd @@ -0,0 +1,30 @@ +#!/sbin/openrc-run +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License, v2 or later + +depend() { + need net + use ircd + provide irc-services +} + +start() { + IRCSERVICES_RUNDIR="${IRCSERVICES_PIDFILE%/*}" + if ! [ -d "${IRCSERVICES_RUNDIR}" ]; then + ebegin "Creating ${IRCSERVICES_RUNDIR} for ${SVCNAME}" + mkdir "${IRCSERVICES_RUNDIR}" && chown "${IRCSERVICES_USER}" "${IRCSERVICES_RUNDIR}" + eend $? + fi + + ebegin "Starting ${SVCNAME}" + start-stop-daemon --start --user ircservices --exec /usr/bin/ircservices -- \ + -dir=/var/lib/ircservices \ + -log=/var/log/ircservices/ircservices.log + eend $? +} + +stop() { + ebegin "Stopping ${SVCNAME}" + start-stop-daemon --stop --pidfile "${IRCSERVICES_PIDFILE}" + eend $? +} diff --git a/net-irc/ircservices/ircservices-5.1.24.ebuild b/net-irc/ircservices/ircservices-5.1.24.ebuild new file mode 100644 index 000000000000..3ebf8ce32dd5 --- /dev/null +++ b/net-irc/ircservices/ircservices-5.1.24.ebuild @@ -0,0 +1,95 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=4 + +inherit eutils fixheadtails flag-o-matic prefix toolchain-funcs user + +DESCRIPTION="ChanServ, NickServ, and MemoServ with support for several IRC daemons" +HOMEPAGE="http://achurch.org/services/" +SRC_URI="http://achurch.org/services/tarballs/${P}.tar.gz" +LICENSE="GPL-2 FDL-1.2" +SLOT="0" +KEYWORDS="amd64 ppc x86" +IUSE="" + +pkg_setup() { + enewgroup ircservices + enewuser ircservices -1 -1 -1 ircservices + + # this is needed, because old ebuilds added the user with ircservices:users + usermod -g ircservices ircservices +} + +src_prepare() { + epatch "${FILESDIR}"/${PN}-5.1.17-fPIC.patch \ + "${FILESDIR}"/${PN}-5.1.17-fPIC-configure.patch \ + "${FILESDIR}"/${P}-ircservices-chk-pidfile.patch \ + "${FILESDIR}"/${P}-parallel-make.patch \ + "${FILESDIR}"/${P}-ldflags.patch \ + "${FILESDIR}"/${P}-as-needed.patch \ + "${FILESDIR}"/${P}-fd_set-amd64.patch + + ht_fix_file configure + sed -i \ + -e "s/-m 750/-m 755/" \ + -e "s/-m 640/-m 644/" \ + configure || die + + sed -i -e "s;ircservices.pid;${EPREFIX}/var/run/ircservices/&;g" data/example-ircservices.conf || die +} + +src_configure() { + append-flags -fno-stack-protector + # configure fails with -O higher than 2 + replace-flags "-O[3-9s]" "-O2" + + RUNGROUP="ircservices" \ + ./configure \ + -cc "$(tc-getCC)" \ + -cflags "${CFLAGS}" \ + -lflags "${LDFLAGS}" \ + -bindest /usr/bin \ + -datdest /var/lib/ircservices \ + || die "./configure failed" +} + +src_install() { + dodir /usr/bin /{etc,usr/{$(get_libdir),share},var/lib}/ircservices + keepdir /var/log/ircservices + + emake \ + BINDEST="${D}"/usr/bin \ + DATDEST="${D}"/var/lib/ircservices \ + install + + mv "${D}"/var/lib/ircservices/convert-db "${D}"/usr/bin/ircservices-convert-db || die "mv failed" + + # Now we move some files around to make it FHS conform + mv "${D}"/var/lib/ircservices/example-ircservices.conf "${D}"/etc/ircservices/ircservices.conf || die "mv failed" + dosym /etc/ircservices/ircservices.conf /var/lib/ircservices/ircservices.conf + + mv "${D}"/var/lib/ircservices/example-modules.conf "${D}"/etc/ircservices/modules.conf || die "mv failed" + dosym /etc/ircservices/modules.conf /var/lib/ircservices/modules.conf + + mv "${D}"/var/lib/ircservices/modules "${D}"/usr/$(get_libdir)/ircservices || die "mv failed" + dosym /usr/$(get_libdir)/ircservices/modules /var/lib/ircservices/modules + + mv "${D}"/var/lib/ircservices/{helpfiles,languages} "${D}"/usr/share/ircservices || die "mv failed" + dosym /usr/share/ircservices/helpfiles /var/lib/ircservices/helpfiles + dosym /usr/share/ircservices/languages /var/lib/ircservices/languages + + fperms 750 /var/{lib,log}/ircservices /etc/ircservices + fperms 640 /etc/ircservices/{ircservices,modules}.conf + fowners ircservices:ircservices /var/{lib,log}/ircservices + fowners root:ircservices /etc/ircservices{,/{ircservices,modules}.conf} + + newinitd "${FILESDIR}"/ircservices.initd ircservices + newconfd "${FILESDIR}"/ircservices.confd ircservices + + doman docs/ircservices*.8 + newman docs/convert-db.8 ircservices-convert-db.8 + + dohtml -r docs/* + dodoc docs/Changes* README docs/WhatsNew +} diff --git a/net-irc/ircservices/metadata.xml b/net-irc/ircservices/metadata.xml new file mode 100644 index 000000000000..db6fa3b9dde5 --- /dev/null +++ b/net-irc/ircservices/metadata.xml @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="person"> + <email>gurligebis@gentoo.org</email> + <name>Bjarke Istrup Pedersen</name> + </maintainer> +</pkgmetadata> |