jengelh/atheme
SHA256
1
0
Fork 0
forked from pool/atheme
Code Pull Requests Activity

Accepting request 76499 from home:jengelh:dev

Browse Source 
- enable LDAP backend
- update to version 6.0.8
* inspircd: Support for owner, halfops and admin are now dynamically
  enabled by what modes exist instead of being enabled by what
  modules you have loaded in inspircd.
* support for InspIRCd 1.1, OfficeIRC and UltimateIRCd 3 has been
  removed.
* opensex is now the required database format. All flatfile will do
  is convert your flatfile database to opensex and exit.
* converted many modules that use external databases to using
  opensex.
- add Requires for pwdutils
- kill libelf-devel, not needed on Linux

OBS-URL: https://build.opensuse.org/request/show/76499
OBS-URL: https://build.opensuse.org/package/show/server:irc/atheme?expand=0&rev=30
This commit is contained in:
Wolfgang Rosenauer 2011-08-02 07:52:16 +00:00 committed by Git OBS Bridge
parent c6c88902a6
commit 17ff074b29
6 changed files with 101 additions and 81 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

120
atheme-config.diff
View File

@ -1,42 +1,17 @@
Give Atheme a good default config that harmonizes with the
ircd package.
ircd-seven package, such that installing ircd7 and atheme,
and then starting both gives a directly usable Services.
Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
---
dist/atheme.conf.example | 54 +++++++++++++++++++++++------------------------
1 file changed, 27 insertions(+), 27 deletions(-)
dist/atheme.conf.example | 48 +++++++++++++++++++++++------------------------
1 file changed, 24 insertions(+), 24 deletions(-)
Index: atheme-877e80d8e0a0/dist/atheme.conf.example
Index: atheme-services-6.0.8/dist/atheme.conf.example
===================================================================
--- atheme-877e80d8e0a0.orig/dist/atheme.conf.example
+++ atheme-877e80d8e0a0/dist/atheme.conf.example
@@ -254,7 +254,7 @@ loadmodule "modules/chanserv/drop";
loadmodule "modules/chanserv/flags";
loadmodule "modules/chanserv/ftransfer";
loadmodule "modules/chanserv/getkey";
-loadmodule "modules/chanserv/halfop";
+#loadmodule "modules/chanserv/halfop";
loadmodule "modules/chanserv/help";
loadmodule "modules/chanserv/hold";
loadmodule "modules/chanserv/info";
@@ -420,11 +420,11 @@ loadmodule "modules/global/main";
* NPC commands (SAY, ACT) modules/botserv/bottalk
* SET command modules/botserv/set
*/
-loadmodule "modules/botserv/main";
-loadmodule "modules/botserv/help";
-loadmodule "modules/botserv/info";
-loadmodule "modules/botserv/bottalk";
-loadmodule "modules/botserv/set";
+#loadmodule "modules/botserv/main";
+#loadmodule "modules/botserv/help";
+#loadmodule "modules/botserv/info";
+#loadmodule "modules/botserv/bottalk";
+#loadmodule "modules/botserv/set";
/* HostServ modules.
*
@@ -470,7 +470,7 @@ loadmodule "modules/botserv/set";
--- atheme-services-6.0.8.orig/dist/atheme.conf.example
+++ atheme-services-6.0.8/dist/atheme.conf.example
@@ -605,7 +605,7 @@ loadmodule "modules/groupserv/main";
*
* HTTP Server modules/misc/httpd
*/
@ -45,16 +20,16 @@ Index: atheme-877e80d8e0a0/dist/atheme.conf.example
/* XMLRPC server module.
*
@@ -482,7 +482,7 @@ loadmodule "modules/misc/httpd";
* Legacy channel management modules/xmlrpc/channel
* Legacy memo management modules/xmlrpc/memo
@@ -614,7 +614,7 @@ loadmodule "modules/misc/httpd";
*
* XMLRPC handler for the httpd modules/xmlrpc/main
*/
-loadmodule "modules/xmlrpc/main";
+#loadmodule "modules/xmlrpc/main";
#loadmodule "modules/xmlrpc/account";
#loadmodule "modules/xmlrpc/channel";
#loadmodule "modules/xmlrpc/memo";
@@ -507,7 +507,7 @@ serverinfo {
/* Other modules.
*
@@ -636,7 +636,7 @@ serverinfo {
* unique on the IRC network and contain at least one dot, but does
* not have to be equal to any DNS name.
*/
@ -63,7 +38,7 @@ Index: atheme-877e80d8e0a0/dist/atheme.conf.example
/* desc
* The ``server comment'' we send to the IRC network.
@@ -530,24 +530,24 @@ serverinfo {
@@ -659,24 +659,24 @@ serverinfo {
/* (*)netname
* The name of your network.
*/
@ -92,16 +67,16 @@ Index: atheme-877e80d8e0a0/dist/atheme.conf.example
/* (*)mta
* The full path to your mail transfer agent.
@@ -639,7 +639,7 @@ serverinfo {
@@ -770,7 +770,7 @@ serverinfo {
* Multiple may be defined but only one will be used at a time (IRC
* being a tree shaped network).
*/
-uplink "irc.example.net" {
+uplink "localhost." {
// the server name goes above
// The server name of the ircd you're linking to goes above.
// host
@@ -652,7 +652,7 @@ uplink "irc.example.net" {
@@ -783,7 +783,7 @@ uplink "irc.example.net" {
// password
// The password used for linking.
@ -109,8 +84,8 @@ Index: atheme-877e80d8e0a0/dist/atheme.conf.example
+ password = "servicespassword";
// port
// The port used for linking.
@@ -696,7 +696,7 @@ nickserv {
// The port to connect to.
@@ -840,7 +840,7 @@ nickserv {
/* (*)host
* The hostname we want NickServ to have.
*/
@ -119,7 +94,7 @@ Index: atheme-877e80d8e0a0/dist/atheme.conf.example
/* (*)real
* The realname (gecos) information we want NickServ to have.
@@ -742,7 +742,7 @@ chanserv {
@@ -914,7 +914,7 @@ chanserv {
/* (*)host
* The hostname we want the client to have.
*/
@ -128,16 +103,16 @@ Index: atheme-877e80d8e0a0/dist/atheme.conf.example
/* (*)real
* The GECOS of the client.
@@ -754,7 +754,7 @@ chanserv {
@@ -932,7 +932,7 @@ chanserv {
* use a lot of CPU up, and will only work if you have
* join_chans (in general) enabled as well.
*/
- fantasy;
+ #fantasy;
/* (*) ca_xop
* Defines what flags the xop access levels comprise.
@@ -849,7 +849,7 @@ global {
/* (*) hide_xop
* Hide the XOP templates from sight. This is useful if you
@@ -1048,7 +1048,7 @@ global {
/* (*)host
* The hostname used for this client.
*/
@ -146,7 +121,16 @@ Index: atheme-877e80d8e0a0/dist/atheme.conf.example
/* (*)real
* The GECOS (real name) of the client.
@@ -878,7 +878,7 @@ operserv {
@@ -1077,7 +1077,7 @@ infoserv {
/* (*)host
* The hostname used for this client,
*/
- host = "services.int";
+ host = "services.localhost.";
/* (*)real
* The GECOS (real name) of the client.
@@ -1113,7 +1113,7 @@ operserv {
/* (*)host
* The hostname used for this client.
*/
@ -155,7 +139,7 @@ Index: atheme-877e80d8e0a0/dist/atheme.conf.example
/* (*)real
* The GECOS (real name) of the client.
@@ -907,7 +907,7 @@ saslserv {
@@ -1148,7 +1148,7 @@ saslserv {
/* (*)host
* The hostname we want SaslServ to have.
*/
@ -164,7 +148,7 @@ Index: atheme-877e80d8e0a0/dist/atheme.conf.example
/* (*)real
* The realname (gecos) information we want SaslServ to have.
@@ -936,7 +936,7 @@ memoserv {
@@ -1177,7 +1177,7 @@ memoserv {
/* (*)host
* The hostname we want MemoServ to have.
*/
@ -173,7 +157,7 @@ Index: atheme-877e80d8e0a0/dist/atheme.conf.example
/* (*)real
* The realname (gecos) information we want MemoServ to have.
@@ -964,7 +964,7 @@ gameserv {
@@ -1211,7 +1211,7 @@ gameserv {
/* (*)host
* The hostname used for this client.
*/
@ -182,7 +166,7 @@ Index: atheme-877e80d8e0a0/dist/atheme.conf.example
/* (*)real
* The GECOS (real name) of the client.
@@ -992,7 +992,7 @@ botserv {
@@ -1245,7 +1245,7 @@ botserv {
/* (*)host
* The hostname used for this client.
*/
@ -191,7 +175,16 @@ Index: atheme-877e80d8e0a0/dist/atheme.conf.example
/* (*)real
* The GECOS (real name) of the client.
@@ -1020,7 +1020,7 @@ hostserv {
@@ -1280,7 +1280,7 @@ groupserv {
/* (*)host
* The hostname we want GroupServ to have.
*/
- host = "services.int";
+ host = "services.localhost.";
/* (*)real
* The realname (gecos) information we want GroupServ to have.
@@ -1330,7 +1330,7 @@ hostserv {
/* (*)host
* The hostname used for this client.
*/
@ -200,7 +193,16 @@ Index: atheme-877e80d8e0a0/dist/atheme.conf.example
/* (*)real
* The GECOS (real name) of the client.
@@ -1046,7 +1046,7 @@ alis {
@@ -1373,7 +1373,7 @@ helpserv {
/* (*)host
* The hostname we want HelpServ to have.
*/
- host = "services.int";
+ host = "services.localhost.";
/* (*)real
* The realname (gecos) information we want HelpServ to have.
@@ -1399,7 +1399,7 @@ alis {
/* (*)host
* The hostname we want ALIS to have.
*/
@ -209,7 +211,7 @@ Index: atheme-877e80d8e0a0/dist/atheme.conf.example
/* (*)real
* The realname (gecos) information we want ALIS to have.
@@ -1194,7 +1194,7 @@ general {
@@ -1570,7 +1570,7 @@ general {
* network channels by keeping them open, and to preserve the
* topic and +beI lists.
*/

10
atheme-lockmodes.diff
View File

@ -6,11 +6,11 @@ Signed-off-By: Jan Engelhardt <jengelh@medozas.de>
modules/chanserv/register.c | 4 ----
1 file changed, 4 deletions(-)
Index: atheme/modules/chanserv/register.c
Index: atheme-services-6.0.8/modules/chanserv/register.c
===================================================================
--- atheme.orig/modules/chanserv/register.c
+++ atheme/modules/chanserv/register.c
@@ -129,10 +129,6 @@ static void cs_cmd_register(sourceinfo_t
--- atheme-services-6.0.8.orig/modules/chanserv/register.c
+++ atheme-services-6.0.8/modules/chanserv/register.c
@@ -142,10 +142,6 @@ static void cs_cmd_register(sourceinfo_t
mc->registered = CURRTIME;
mc->used = CURRTIME;
mc->mlock_on |= (CMODE_NOEXT | CMODE_TOPIC);
@ -20,4 +20,4 @@ Index: atheme/modules/chanserv/register.c
- mc->mlock_off |= CMODE_KEY;
mc->flags |= config_options.defcflags;
chanacs_add(mc, si->smu, CA_INITIAL & ca_all, CURRTIME);
chanacs_add(mc, entity(si->smu), CA_INITIAL & ca_all, CURRTIME);

3
atheme-services-5.0.1+4628.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:ae622e9da3b671a0c1317dac2c2bc62e30ef50724957790d27e1355ec3004e2a
size 696534

3
atheme-services-6.0.8.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:0e828625319fae54726049f9209a4e81ee09298a77a56027ec43d016a1e1202f
size 705824

16
atheme.changes
View File

@ -1,3 +1,19 @@
-------------------------------------------------------------------
Sat Jun 25 18:07:07 UTC 2011 - jengelh@medozas.de
- enable LDAP backend
- update to version 6.0.8
* inspircd: Support for owner, halfops and admin are now dynamically
enabled by what modes exist instead of being enabled by what
modules you have loaded in inspircd.
* support for InspIRCd 1.1, OfficeIRC and UltimateIRCd 3 has been
removed.
* opensex is now the required database format. All flatfile will do
is convert your flatfile database to opensex and exit.
* converted many modules that use external databases to using
opensex.
- add Requires for pwdutils
-------------------------------------------------------------------
Tue Mar 9 23:21:00 UTC 2010 - mrueckert@suse.de

30
atheme.spec
View File

@ -1,7 +1,7 @@
# norootforbuild
Name: atheme
Version: 5.0.1+4628
Version: 6.0.8
Release: 0
%define pkg_name atheme-services
#
@ -10,17 +10,21 @@ Group: Productivity/Networking/IRC
#
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: libopenssl-devel pkgconfig libmowgli-devel >= 0.7.0 pcre-devel
BuildRequires: openldap2-devel, xz
%define atheme_home /var/lib/atheme
%define atheme_log /var/log/atheme
%define atheme_run /var/run/atheme
#
URL: http://www.atheme.net/
Source: http://distfiles.atheme.org/atheme-services-%{version}.tar.bz2
#Git-Clone: git://git.atheme.org/atheme
Source: http://distfiles.atheme.org/atheme-services-%{version}.tar.xz
Source1: atheme.init
Patch1: atheme-lockmodes.diff
Patch2: atheme-config.diff
#
Summary: A portable, secure set of open source, modular IRC services
Requires(pre): pwdutils
%description
Atheme is a portable, secure set of open source, modular IRC services released
under the BSD license, designed to run on many IRCds.
@ -50,8 +54,7 @@ Authors:
%prep
#setup -n %{name}-services-%{version}
%setup -n %{name}
%setup -qn %name-services-%version
%patch -P 1 -P 2 -p1
# use system libmowgli
rm -Rf libmowgli;
@ -67,17 +70,16 @@ export CFLAGS="%{optflags} -fstack-protector"
--enable-fhs-paths \
--enable-warnings \
--enable-large-net \
--with-pcre
--with-pcre \
--enable-contrib
%{__make}
%{__make} -C contrib
make %{?_smp_mflags}
%install
%makeinstall DOCDIR=%{_docdir}/%{name}
%makeinstall DOCDIR=%{_docdir}/%{name} -C contrib
# additional documentation
%{__install} -m 0644 contrib/*.php contrib/*.pl TODO .logo %{buildroot}%{_docdir}/%{name}
%{__install} -m 0644 contrib/*.php contrib/*.pl TODO %{buildroot}%{_docdir}/%{name}
#%{__mv} -v %{buildroot}%{_sysconfdir}/%{name}/atheme.chk.sample %{buildroot}%{_docdir}/%{name}
# init scripts
@ -90,12 +92,12 @@ export CFLAGS="%{optflags} -fstack-protector"
%{__cp} -v %{buildroot}%{_sysconfdir}/%{name}/atheme.motd{.example,}
%find_lang %name
%clean
%{__rm} -rf %{buildroot}
%pre
/usr/sbin/groupadd -r atheme &>/dev/null ||:
/usr/sbin/useradd -r -o -g atheme -s /bin/false -c "%{name} daemon" -d %{atheme_home} atheme &>/dev/null || :
/usr/bin/getent group atheme >/dev/null 2>/dev/null || \
/usr/sbin/groupadd -r atheme >/dev/null || :;
/usr/bin/getent passwd atheme >/dev/null 2>/dev/null || \
/usr/sbin/useradd -r -o -g atheme -s /bin/false \
-c "%{name} daemon" -d %{atheme_home} atheme >/dev/null || :;
%preun
%stop_on_removal %{name}