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

- update to version 5.0.1+4628

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/server:irc/atheme?expand=0&rev=29
This commit is contained in:
Marcus Rückert 2010-03-09 23:23:44 +00:00 committed by Git OBS Bridge
parent 0e1c11a731
commit c6c88902a6
6 changed files with 287 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
atheme-2.2.0.tar.gz
View File

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

220
atheme-config.diff Normal file
View File

@ -0,0 +1,220 @@
Give Atheme a good default config that harmonizes with the
ircd package.
Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
---
dist/atheme.conf.example | 54 +++++++++++++++++++++++------------------------
1 file changed, 27 insertions(+), 27 deletions(-)
Index: atheme-877e80d8e0a0/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";
*
* HTTP Server modules/misc/httpd
*/
-loadmodule "modules/misc/httpd";
+#loadmodule "modules/misc/httpd";
/* XMLRPC server module.
*
@@ -482,7 +482,7 @@ loadmodule "modules/misc/httpd";
* Legacy channel management modules/xmlrpc/channel
* Legacy memo management modules/xmlrpc/memo
*/
-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 {
* unique on the IRC network and contain at least one dot, but does
* not have to be equal to any DNS name.
*/
- name = "services.int";
+ name = "services.localhost.";
/* desc
* The ``server comment'' we send to the IRC network.
@@ -530,24 +530,24 @@ serverinfo {
/* (*)netname
* The name of your network.
*/
- netname = "misconfigured network";
+ netname = "unconfigured network";
/* (*)hidehostsuffix
* P10 +x host hiding gives <account>.<hidehostsuffix>.
* If using +x on asuka/bircd/undernet, this must agree
* with F:HIDDEN_HOST.
*/
- hidehostsuffix = "users.misconfigured";
+ hidehostsuffix = "users.unconfigured";
/* (*)adminname
* The name of the person running this service.
*/
- adminname = "misconfigured admin";
+ adminname = "unconfigured admin";
/* (*)adminemail
* The email address of the person running this service.
*/
- adminemail = "misconfigured@admin.tld";
+ adminemail = "unconfigured@admin.tld";
/* (*)mta
* The full path to your mail transfer agent.
@@ -639,7 +639,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
// host
@@ -652,7 +652,7 @@ uplink "irc.example.net" {
// password
// The password used for linking.
- password = "linkage";
+ password = "servicespassword";
// port
// The port used for linking.
@@ -696,7 +696,7 @@ nickserv {
/* (*)host
* The hostname we want NickServ to have.
*/
- host = "services.int";
+ host = "services.localhost.";
/* (*)real
* The realname (gecos) information we want NickServ to have.
@@ -742,7 +742,7 @@ chanserv {
/* (*)host
* The hostname we want the client to have.
*/
- host = "services.int";
+ host = "services.localhost.";
/* (*)real
* The GECOS of the client.
@@ -754,7 +754,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 {
/* (*)host
* The hostname used for this client.
*/
- host = "services.int";
+ host = "services.localhost.";
/* (*)real
* The GECOS (real name) of the client.
@@ -878,7 +878,7 @@ operserv {
/* (*)host
* The hostname used for this client.
*/
- host = "services.int";
+ host = "services.localhost.";
/* (*)real
* The GECOS (real name) of the client.
@@ -907,7 +907,7 @@ saslserv {
/* (*)host
* The hostname we want SaslServ to have.
*/
- host = "services.int";
+ host = "services.localhost.";
/* (*)real
* The realname (gecos) information we want SaslServ to have.
@@ -936,7 +936,7 @@ memoserv {
/* (*)host
* The hostname we want MemoServ to have.
*/
- host = "services.int";
+ host = "services.localhost.";
/* (*)real
* The realname (gecos) information we want MemoServ to have.
@@ -964,7 +964,7 @@ gameserv {
/* (*)host
* The hostname used for this client.
*/
- host = "services.int";
+ host = "services.localhost.";
/* (*)real
* The GECOS (real name) of the client.
@@ -992,7 +992,7 @@ botserv {
/* (*)host
* The hostname used for this client.
*/
- host = "services.int";
+ host = "services.localhost.";
/* (*)real
* The GECOS (real name) of the client.
@@ -1020,7 +1020,7 @@ hostserv {
/* (*)host
* The hostname used for this client.
*/
- host = "services.int";
+ host = "services.localhost.";
/* (*)real
* The GECOS (real name) of the client.
@@ -1046,7 +1046,7 @@ alis {
/* (*)host
* The hostname we want ALIS to have.
*/
- host = "services.int";
+ host = "services.localhost.";
/* (*)real
* The realname (gecos) information we want ALIS to have.
@@ -1194,7 +1194,7 @@ general {
* network channels by keeping them open, and to preserve the
* topic and +beI lists.
*/
- leave_chans;
+ #leave_chans;
/* secure
* Do you want to require the use of /msg <service>@<services host>?

23
atheme-lockmodes.diff Normal file
View File

@ -0,0 +1,23 @@
Add +k and +l channel modes to the default locks, so empty channels'
protection is properly restored across Services reboots.
Signed-off-By: Jan Engelhardt <jengelh@medozas.de>
---
modules/chanserv/register.c | 4 ----
1 file changed, 4 deletions(-)
Index: atheme/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
mc->registered = CURRTIME;
mc->used = CURRTIME;
mc->mlock_on |= (CMODE_NOEXT | CMODE_TOPIC);
- if (c->limit == 0)
- mc->mlock_off |= CMODE_LIMIT;
- if (c->key == NULL)
- mc->mlock_off |= CMODE_KEY;
mc->flags |= config_options.defcflags;
chanacs_add(mc, si->smu, CA_INITIAL & ca_all, CURRTIME);

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

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

5
atheme.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Tue Mar 9 23:21:00 UTC 2010 - mrueckert@suse.de
- update to version 5.0.1+4628
-------------------------------------------------------------------
Thu Aug 23 06:32:22 CEST 2007 - mrueckert@suse.de

69
atheme.spec
View File

@ -1,22 +1,24 @@
# norootforbuild
Name: atheme
Version: 2.2.0
Version: 5.0.1+4628
Release: 0
%define pkg_name atheme
%define pkg_name atheme-services
#
License: BSD
Group: Productivity/Networking/IRC
#
BuildRoot: %{_tmppath}/%{pkg_name}-%{version}-build
BuildRequires: openssl-devel pkgconfig
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: libopenssl-devel pkgconfig libmowgli-devel >= 0.7.0 pcre-devel
%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-%{version}.tar.gz
Source: http://distfiles.atheme.org/atheme-services-%{version}.tar.bz2
Source1: atheme.init
Patch1: atheme-lockmodes.diff
Patch2: atheme-config.diff
#
Summary: A portable, secure set of open source, modular IRC services
%description
@ -48,18 +50,24 @@ Authors:
%prep
%setup -n %{pkg_name}-%{version}
#setup -n %{name}-services-%{version}
%setup -n %{name}
%patch -P 1 -P 2 -p1
# use system libmowgli
rm -Rf libmowgli;
%build
%if 0%{?suse_version} > 1000 && 0%{?suse_version} < 1030
export CFLAGS="%{optflags} -fstack-protector"
%endif
%configure \
--sysconfdir=%{_sysconfdir}/%{pkg_name} \
--sysconfdir=%{_sysconfdir}/%{name} \
--bindir=%{_sbindir} \
--docdir=%{_docdir}/%name \
--enable-fhs-paths \
--enable-warnings \
--enable-large-net
--enable-large-net \
--with-pcre
%{__make}
%{__make} -C contrib
@ -69,55 +77,50 @@ export CFLAGS="%{optflags} -fstack-protector"
%makeinstall DOCDIR=%{_docdir}/%{name} -C contrib
# additional documentation
%{__install} -m 0644 contrib/*.php contrib/*.pl ChangeLog TODO .logo SVN-Access %{buildroot}%{_docdir}/%{name}
%{__mv} -v %{buildroot}%{_sysconfdir}/%{name}/atheme.chk.sample %{buildroot}%{_docdir}/%{name}
%{__install} -m 0644 contrib/*.php contrib/*.pl TODO .logo %{buildroot}%{_docdir}/%{name}
#%{__mv} -v %{buildroot}%{_sysconfdir}/%{name}/atheme.chk.sample %{buildroot}%{_docdir}/%{name}
# init scripts
%{__install} -D -m 0755 %{S:1} %{buildroot}%{_sysconfdir}/init.d/%{pkg_name}
%{__ln_s} -f %{_sysconfdir}/init.d/%{pkg_name} %{buildroot}%{_sbindir}/rc%{pkg_name}
%{__install} -D -m 0755 %{S:1} %{buildroot}%{_sysconfdir}/init.d/%{name}
%{__ln_s} -f %{_sysconfdir}/init.d/%{name} %{buildroot}%{_sbindir}/rc%{name}
# config files
# TODO: check if we should change any defaults and patch it.
%{__cp} -v %{buildroot}%{_sysconfdir}/%{name}/{example,atheme}.conf
%{__cp} -v %{buildroot}%{_sysconfdir}/%{name}/{example,atheme}.motd
%{__cp} -v %{buildroot}%{_sysconfdir}/%{name}/atheme.conf{.example,}
%{__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 "%{pkg_name} daemon" -d %{atheme_home} atheme &>/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 %{pkg_name}
%stop_on_removal %{name}
%post
%fillup_and_insserv %{pkg_name}
%fillup_and_insserv %{name}
%postun
%restart_on_update %{pkg_name}
%restart_on_update %{name}
%insserv_cleanup
%files
%files -f %{name}.lang
%defattr(-,root,root,-)
%{_sysconfdir}/init.d/%{pkg_name}
%{_sbindir}/rc%{pkg_name}
%dir %attr(750,root,atheme) %{_sysconfdir}/%{pkg_name}
%config(noreplace) %attr(640,root,atheme) %{_sysconfdir}/%{pkg_name}/atheme.conf
%config(noreplace) %attr(640,root,atheme) %{_sysconfdir}/%{pkg_name}/atheme.motd
%{_sysconfdir}/%{pkg_name}/example.conf
%{_sysconfdir}/%{pkg_name}/example.motd
%{_sysconfdir}/%{pkg_name}/example.userserv.conf
%{_sysconfdir}/init.d/%{name}
%{_sbindir}/rc%{name}
%dir %attr(750,root,atheme) %{_sysconfdir}/%{name}
%config(noreplace) %attr(640,root,atheme) %{_sysconfdir}/%{name}/atheme.conf
%config(noreplace) %attr(640,root,atheme) %{_sysconfdir}/%{name}/atheme.motd
%{_sysconfdir}/%{name}/*example
%{_sbindir}/atheme-services
%{_libdir}/%{pkg_name}
%{_datadir}/%{pkg_name}
%{_libdir}/%{name}
%{_datadir}/%{name}
%doc %{_docdir}/%{name}
%dir %attr(750,atheme,atheme) %{atheme_home}
%dir %attr(750,atheme,atheme) %{atheme_run}
%dir %attr(750,atheme,atheme) %{atheme_log}
%changelog
* Tue Feb 20 2007 - mrueckert@suse.de
- update to version 2.1.0
* Sat Nov 25 2006 - mrueckert@suse.de
- initial package of version 2.0.0