From 1342952c033d9ff5462b0171ee79b72f6d6f44c8937da64fb112f065c96aeb3b Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Thu, 31 May 2012 13:20:04 +0000 Subject: [PATCH] atheme 7.0.2, first round OBS-URL: https://build.opensuse.org/package/show/server:irc/atheme?expand=0&rev=40 --- atheme-config.diff | 59 ++++++-------- atheme-lockmodes.diff | 8 +- atheme-services-6.0.10.tar.xz | 3 - atheme-services-7.0.2.tar.xz | 3 + atheme.changes | 10 +++ atheme.spec | 145 +++++++++++++++++++++------------- 6 files changed, 130 insertions(+), 98 deletions(-) delete mode 100644 atheme-services-6.0.10.tar.xz create mode 100644 atheme-services-7.0.2.tar.xz diff --git a/atheme-config.diff b/atheme-config.diff index 2a4deca..32e6949 100644 --- a/atheme-config.diff +++ b/atheme-config.diff @@ -4,14 +4,14 @@ and then starting both gives a directly usable Services. Signed-off-by: Jan Engelhardt --- - dist/atheme.conf.example | 48 +++++++++++++++++++++++------------------------ - 1 file changed, 24 insertions(+), 24 deletions(-) + dist/atheme.conf.example | 46 +++++++++++++++++++++++----------------------- + 1 file changed, 23 insertions(+), 23 deletions(-) -Index: atheme-services-6.0.8/dist/atheme.conf.example +Index: atheme-services-7.0.2/dist/atheme.conf.example =================================================================== ---- 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"; +--- atheme-services-7.0.2.orig/dist/atheme.conf.example ++++ atheme-services-7.0.2/dist/atheme.conf.example +@@ -708,7 +708,7 @@ loadmodule "modules/groupserv/set_url"; * * HTTP Server modules/misc/httpd */ @@ -20,16 +20,7 @@ Index: atheme-services-6.0.8/dist/atheme.conf.example /* XMLRPC server module. * -@@ -614,7 +614,7 @@ loadmodule "modules/misc/httpd"; - * - * XMLRPC handler for the httpd modules/xmlrpc/main - */ --loadmodule "modules/xmlrpc/main"; -+#loadmodule "modules/xmlrpc/main"; - - /* Other modules. - * -@@ -636,7 +636,7 @@ serverinfo { +@@ -757,7 +757,7 @@ serverinfo { * unique on the IRC network and contain at least one dot, but does * not have to be equal to any DNS name. */ @@ -38,7 +29,7 @@ Index: atheme-services-6.0.8/dist/atheme.conf.example /* desc * The ``server comment'' we send to the IRC network. -@@ -659,24 +659,24 @@ serverinfo { +@@ -780,24 +780,24 @@ serverinfo { /* (*)netname * The name of your network. */ @@ -67,7 +58,7 @@ Index: atheme-services-6.0.8/dist/atheme.conf.example /* (*)mta * The full path to your mail transfer agent. -@@ -770,7 +770,7 @@ serverinfo { +@@ -891,7 +891,7 @@ serverinfo { * Multiple may be defined but only one will be used at a time (IRC * being a tree shaped network). */ @@ -76,7 +67,7 @@ Index: atheme-services-6.0.8/dist/atheme.conf.example // The server name of the ircd you're linking to goes above. // host -@@ -783,7 +783,7 @@ uplink "irc.example.net" { +@@ -904,7 +904,7 @@ uplink "irc.example.net" { // password // The password used for linking. @@ -85,7 +76,7 @@ Index: atheme-services-6.0.8/dist/atheme.conf.example // port // The port to connect to. -@@ -840,7 +840,7 @@ nickserv { +@@ -961,7 +961,7 @@ nickserv { /* (*)host * The hostname we want NickServ to have. */ @@ -94,7 +85,7 @@ Index: atheme-services-6.0.8/dist/atheme.conf.example /* (*)real * The realname (gecos) information we want NickServ to have. -@@ -914,7 +914,7 @@ chanserv { +@@ -1052,7 +1052,7 @@ chanserv { /* (*)host * The hostname we want the client to have. */ @@ -103,7 +94,7 @@ Index: atheme-services-6.0.8/dist/atheme.conf.example /* (*)real * The GECOS of the client. -@@ -932,7 +932,7 @@ chanserv { +@@ -1076,7 +1076,7 @@ chanserv { * use a lot of CPU up, and will only work if you have * join_chans (in general) enabled as well. */ @@ -112,7 +103,7 @@ Index: atheme-services-6.0.8/dist/atheme.conf.example /* (*) hide_xop * Hide the XOP templates from sight. This is useful if you -@@ -1048,7 +1048,7 @@ global { +@@ -1242,7 +1242,7 @@ global { /* (*)host * The hostname used for this client. */ @@ -121,7 +112,7 @@ Index: atheme-services-6.0.8/dist/atheme.conf.example /* (*)real * The GECOS (real name) of the client. -@@ -1077,7 +1077,7 @@ infoserv { +@@ -1271,7 +1271,7 @@ infoserv { /* (*)host * The hostname used for this client, */ @@ -130,7 +121,7 @@ Index: atheme-services-6.0.8/dist/atheme.conf.example /* (*)real * The GECOS (real name) of the client. -@@ -1113,7 +1113,7 @@ operserv { +@@ -1307,7 +1307,7 @@ operserv { /* (*)host * The hostname used for this client. */ @@ -139,7 +130,7 @@ Index: atheme-services-6.0.8/dist/atheme.conf.example /* (*)real * The GECOS (real name) of the client. -@@ -1148,7 +1148,7 @@ saslserv { +@@ -1348,7 +1348,7 @@ saslserv { /* (*)host * The hostname we want SaslServ to have. */ @@ -148,7 +139,7 @@ Index: atheme-services-6.0.8/dist/atheme.conf.example /* (*)real * The realname (gecos) information we want SaslServ to have. -@@ -1177,7 +1177,7 @@ memoserv { +@@ -1377,7 +1377,7 @@ memoserv { /* (*)host * The hostname we want MemoServ to have. */ @@ -157,7 +148,7 @@ Index: atheme-services-6.0.8/dist/atheme.conf.example /* (*)real * The realname (gecos) information we want MemoServ to have. -@@ -1211,7 +1211,7 @@ gameserv { +@@ -1417,7 +1417,7 @@ gameserv { /* (*)host * The hostname used for this client. */ @@ -166,7 +157,7 @@ Index: atheme-services-6.0.8/dist/atheme.conf.example /* (*)real * The GECOS (real name) of the client. -@@ -1245,7 +1245,7 @@ botserv { +@@ -1457,7 +1457,7 @@ rpgserv { /* (*)host * The hostname used for this client. */ @@ -175,7 +166,7 @@ Index: atheme-services-6.0.8/dist/atheme.conf.example /* (*)real * The GECOS (real name) of the client. -@@ -1280,7 +1280,7 @@ groupserv { +@@ -1532,7 +1532,7 @@ groupserv { /* (*)host * The hostname we want GroupServ to have. */ @@ -184,7 +175,7 @@ Index: atheme-services-6.0.8/dist/atheme.conf.example /* (*)real * The realname (gecos) information we want GroupServ to have. -@@ -1330,7 +1330,7 @@ hostserv { +@@ -1597,7 +1597,7 @@ hostserv { /* (*)host * The hostname used for this client. */ @@ -193,7 +184,7 @@ Index: atheme-services-6.0.8/dist/atheme.conf.example /* (*)real * The GECOS (real name) of the client. -@@ -1373,7 +1373,7 @@ helpserv { +@@ -1646,7 +1646,7 @@ helpserv { /* (*)host * The hostname we want HelpServ to have. */ @@ -202,7 +193,7 @@ Index: atheme-services-6.0.8/dist/atheme.conf.example /* (*)real * The realname (gecos) information we want HelpServ to have. -@@ -1399,7 +1399,7 @@ alis { +@@ -1700,7 +1700,7 @@ alis { /* (*)host * The hostname we want ALIS to have. */ @@ -211,7 +202,7 @@ Index: atheme-services-6.0.8/dist/atheme.conf.example /* (*)real * The realname (gecos) information we want ALIS to have. -@@ -1570,7 +1570,7 @@ general { +@@ -1868,7 +1868,7 @@ general { * network channels by keeping them open, and to preserve the * topic and +beI lists. */ diff --git a/atheme-lockmodes.diff b/atheme-lockmodes.diff index eb25126..56263da 100644 --- a/atheme-lockmodes.diff +++ b/atheme-lockmodes.diff @@ -6,10 +6,10 @@ Signed-off-By: Jan Engelhardt modules/chanserv/register.c | 4 ---- 1 file changed, 4 deletions(-) -Index: atheme-services-6.0.8/modules/chanserv/register.c +Index: atheme-services-7.0.2/modules/chanserv/register.c =================================================================== ---- atheme-services-6.0.8.orig/modules/chanserv/register.c -+++ atheme-services-6.0.8/modules/chanserv/register.c +--- atheme-services-7.0.2.orig/modules/chanserv/register.c ++++ atheme-services-7.0.2/modules/chanserv/register.c @@ -142,10 +142,6 @@ static void cs_cmd_register(sourceinfo_t mc->registered = CURRTIME; mc->used = CURRTIME; @@ -20,4 +20,4 @@ Index: atheme-services-6.0.8/modules/chanserv/register.c - mc->mlock_off |= CMODE_KEY; mc->flags |= config_options.defcflags; - chanacs_add(mc, entity(si->smu), CA_INITIAL & ca_all, CURRTIME); + chanacs_add(mc, entity(si->smu), custom_founder_check(), CURRTIME, entity(si->smu)); diff --git a/atheme-services-6.0.10.tar.xz b/atheme-services-6.0.10.tar.xz deleted file mode 100644 index fb2b174..0000000 --- a/atheme-services-6.0.10.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5e57e3604976143f02fa223b238ba92efd209e4b8ed228e5b03f1e8d82885ccb -size 705480 diff --git a/atheme-services-7.0.2.tar.xz b/atheme-services-7.0.2.tar.xz new file mode 100644 index 0000000..75d33aa --- /dev/null +++ b/atheme-services-7.0.2.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:65132175aa421a23ccba2a8e804d4490b4f32fc25e428fc633c6a2a5edcacb39 +size 870312 diff --git a/atheme.changes b/atheme.changes index ca2725f..eebbd00 100644 --- a/atheme.changes +++ b/atheme.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Thu May 31 12:55:59 UTC 2012 - jengelh@inai.de + +- Update to new upstream release 7.0.2 +* new "dbverify" utility to perform extensive and complicated + consistency checks on the object store +* channel locking updates for inspircd and charybdis +* SASL support for unrealircd +* many more changes, see "NEWS" file in the package + ------------------------------------------------------------------- Wed Apr 11 17:16:11 UTC 2012 - simone.tolotti@gmail.com diff --git a/atheme.spec b/atheme.spec index 210cb8c..7c3ddd5 100644 --- a/atheme.spec +++ b/atheme.spec @@ -15,58 +15,76 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: atheme -Version: 6.0.10 -Release: 0 %define pkg_name atheme-services -# -# -BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildRequires: libmowgli-devel >= 0.7.0 -BuildRequires: libopenssl-devel -BuildRequires: openldap2-devel -BuildRequires: pcre-devel -BuildRequires: pkgconfig -BuildRequires: xz -%define atheme_home /var/lib/atheme -%define atheme_log /var/log/atheme -%define atheme_run /var/run/atheme -# -Url: http://www.atheme.net/ -#Git-Clone: git://git.atheme.org/atheme +%define lname libathemecore1 +Version: 7.0.2 +Release: 0 +Url: http://atheme.net/ +Summary: A portable, secure set of open source, modular IRC services +License: MIT +Group: Productivity/Networking/IRC + +#Git-Clone: git://github.com/atheme/atheme #DL-URL: http://atheme.net/downloads/atheme-services-6.0.10.tar.bz2 Source: %name-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 -License: BSD-3-Clause -Group: Productivity/Networking/IRC +BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildRequires: cracklib-devel +BuildRequires: libopenssl-devel +BuildRequires: openldap2-devel +BuildRequires: pkgconfig +BuildRequires: xz +BuildRequires: pkgconfig(libmowgli-2) >= 2.0.0 +BuildRequires: pkgconfig(libpcre) +%define atheme_home /var/lib/atheme +%define atheme_log /var/log/atheme +%define atheme_run /var/run/atheme 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. +Atheme is a portable, secure set of open source, modular IRC services +released under the BSD license, designed to run on many IRCds. -Unlike alternative packages, Atheme's core is minimalistic, providing only core -functionality. Atheme is a complete services set, excluding features designed -for oper abuse. +Unlike alternative packages, Atheme's core is minimalistic, providing +only core functionality. Atheme is a complete services set, excluding +features designed for oper abuse. + +%package -n %lname +Summary: The Atheme IRC Services core library +Group: System/Libraries + +%description -n %lname +Atheme is a portable, secure set of open source, modular IRC services +released under the BSD license, designed to run on many IRCds. + +%package devel +Summary: Development files for the Atheme IRC Services core +Group: Development/Libraries/C and C++ +Requires: %lname = %version + +%description devel + +This package contains the development headers for the library found +in %lname. %prep %setup -qn %name-services-%version %patch -P 1 -P 2 -p1 # use system libmowgli -rm -Rf libmowgli; +rm -Rf libmowgli*; %build %if 0%{?suse_version} > 1000 && 0%{?suse_version} < 1030 -export CFLAGS="%{optflags} -fstack-protector" +export CFLAGS="%optflags -fstack-protector" %endif %configure \ - --sysconfdir=%{_sysconfdir}/%{name} \ - --bindir=%{_sbindir} \ - --docdir=%{_docdir}/%name \ + --sysconfdir="%_sysconfdir/%name" \ + --bindir="%_sbindir" \ + --docdir="%_docdir/%name" \ --enable-fhs-paths \ --enable-warnings \ --enable-large-net \ @@ -76,20 +94,22 @@ export CFLAGS="%{optflags} -fstack-protector" make %{?_smp_mflags} %install -%makeinstall DOCDIR=%{_docdir}/%{name} +b="%buildroot"; +%makeinstall DOCDIR="%_docdir/%name" # additional documentation -%{__install} -m 0644 contrib/*.php contrib/*.pl TODO %{buildroot}%{_docdir}/%{name} -#%{__mv} -v %{buildroot}%{_sysconfdir}/%{name}/atheme.chk.sample %{buildroot}%{_docdir}/%{name} +mkdir -p "$b/%_docdir/%name" +install -m 0644 contrib/*.php contrib/*.pl TODO "$b/%_docdir/%name" +#mv -v "$b/%_sysconfdir/%name/atheme.chk.sample" "$b/%_docdir/%name" # init scripts -%{__install} -D -m 0755 %{S:1} %{buildroot}%{_sysconfdir}/init.d/%{name} -%{__ln_s} -f %{_sysconfdir}/init.d/%{name} %{buildroot}%{_sbindir}/rc%{name} +install -Dm 0755 "%{S:1}" "$b/%_sysconfdir/init.d/%name"; +ln -sf "%_sysconfdir/init.d/%name" "$b/%_sbindir/rc%name"; # config files # TODO: check if we should change any defaults and patch it. -%{__cp} -v %{buildroot}%{_sysconfdir}/%{name}/atheme.conf{.example,} -%{__cp} -v %{buildroot}%{_sysconfdir}/%{name}/atheme.motd{.example,} +cp -v "$b/%_sysconfdir/%name"/atheme.conf{.example,} +cp -v "$b/%_sysconfdir/%name"/atheme.motd{.example,} %find_lang %name %pre @@ -97,32 +117,43 @@ make %{?_smp_mflags} /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 || :; + -c "%name daemon" -d "%atheme_home" atheme >/dev/null || :; %preun -%stop_on_removal %{name} +%stop_on_removal %name %post -%fillup_and_insserv %{name} +%fillup_and_insserv %name %postun -%restart_on_update %{name} +%restart_on_update %name %insserv_cleanup -%files -f %{name}.lang -%defattr(-,root,root,-) -%{_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}/%{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} +%files -f %name.lang +%defattr(-,root,root) +%_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/dbverify +%_sbindir/atheme-services +%_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 + +%files -n %lname +%defattr(-,root,root) +%_libdir/libathemecore.so.1* + +%files devel +%defattr(-,root,root) +%_includedir/atheme +%_libdir/libathemecore.so +%_libdir/pkgconfig/atheme-services.pc %changelog