From a3af4bf6e371e03d19f899042043d2e528b3039c040892581839926d07faad06 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Thu, 4 Dec 2014 09:34:58 +0000 Subject: [PATCH] atheme-7.2.1 OBS-URL: https://build.opensuse.org/package/show/server:irc/atheme?expand=0&rev=61 --- atheme-nodate.diff | 46 ++++++++++++----------------------- atheme-services-7.1.0.tar.bz2 | 3 --- atheme-services-7.2.1.tar.bz2 | 3 +++ atheme.changes | 19 +++++++++++++++ atheme.spec | 9 ++++--- 5 files changed, 44 insertions(+), 36 deletions(-) delete mode 100644 atheme-services-7.1.0.tar.bz2 create mode 100644 atheme-services-7.2.1.tar.bz2 diff --git a/atheme-nodate.diff b/atheme-nodate.diff index f978f4d..07b7273 100644 --- a/atheme-nodate.diff +++ b/atheme-nodate.diff @@ -4,41 +4,27 @@ Date: 2012-10-28 01:35:57.295975255 +0200 __DATE__ is not desired; causes unnecessary rebuilds. --- - libathemecore/ctcp-common.c | 2 +- - libathemecore/ptasks.c | 2 +- - modules/operserv/uptime.c | 2 +- - 3 files changed, 3 insertions(+), 3 deletions(-) + libathemecore/ptasks.c | 2 +- + modules/operserv/uptime.c | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) -Index: atheme-services-7.1.0/libathemecore/ctcp-common.c +Index: atheme-services-7.2.1/libathemecore/ptasks.c =================================================================== ---- atheme-services-7.1.0.orig/libathemecore/ctcp-common.c -+++ atheme-services-7.1.0/libathemecore/ctcp-common.c -@@ -44,7 +44,7 @@ static void ctcp_version_handler(sourcei - - notice(si->service->nick, si->su->nick, - "\001VERSION %s. %s %s %s [%s] [enc:%s] Build Date: %s\001", -- PACKAGE_STRING, revision, me.name, get_conf_opts(), ircd->ircdname, ci->id, __DATE__); -+ PACKAGE_STRING, revision, me.name, get_conf_opts(), ircd->ircdname, ci->id, "suse"); +--- atheme-services-7.2.1.orig/libathemecore/ptasks.c ++++ atheme-services-7.2.1/libathemecore/ptasks.c +@@ -45,7 +45,7 @@ int get_version_string(char *buf, size_t + { + const crypt_impl_t *ci = crypt_get_default_provider(); + return snprintf(buf, bufsize, "%s. %s %s :%s [%s] [enc:%s] Build Date: %s", +- PACKAGE_STRING, me.name, revision, get_conf_opts(), ircd->ircdname, ci->id, __DATE__); ++ PACKAGE_STRING, me.name, revision, get_conf_opts(), ircd->ircdname, ci->id, "suse"); } - static void ctcp_clientinfo_handler(sourceinfo_t *si, char *cmd, char *args) -Index: atheme-services-7.1.0/libathemecore/ptasks.c + void handle_version(user_t *u) +Index: atheme-services-7.2.1/modules/operserv/uptime.c =================================================================== ---- atheme-services-7.1.0.orig/libathemecore/ptasks.c -+++ atheme-services-7.1.0/libathemecore/ptasks.c -@@ -51,7 +51,7 @@ void handle_version(user_t *u) - return; - - numeric_sts(me.me, 351, u, "%s. %s %s :%s [%s] [enc:%s] Build Date: %s", -- PACKAGE_STRING, me.name, revision, get_conf_opts(), ircd->ircdname, ci->id, __DATE__); -+ PACKAGE_STRING, me.name, revision, get_conf_opts(), ircd->ircdname, ci->id, "suse"); - } - - void handle_admin(user_t *u) -Index: atheme-services-7.1.0/modules/operserv/uptime.c -=================================================================== ---- atheme-services-7.1.0.orig/modules/operserv/uptime.c -+++ atheme-services-7.1.0/modules/operserv/uptime.c +--- atheme-services-7.2.1.orig/modules/operserv/uptime.c ++++ atheme-services-7.2.1/modules/operserv/uptime.c @@ -33,7 +33,7 @@ static void os_cmd_uptime(sourceinfo_t * { logcommand(si, CMDLOG_GET, "UPTIME"); diff --git a/atheme-services-7.1.0.tar.bz2 b/atheme-services-7.1.0.tar.bz2 deleted file mode 100644 index 9ade2e7..0000000 --- a/atheme-services-7.1.0.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a4290dc41bdd825ee39c2094ba2c0633e75bed344d66f57b6fe9e7ec035fccd2 -size 1201309 diff --git a/atheme-services-7.2.1.tar.bz2 b/atheme-services-7.2.1.tar.bz2 new file mode 100644 index 0000000..fe427da --- /dev/null +++ b/atheme-services-7.2.1.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:10e58c5f2f75fe37148ab3a299b33b37f38d1ea876f4668d9d3350a29328b87b +size 1205454 diff --git a/atheme.changes b/atheme.changes index 4097d62..d272be6 100644 --- a/atheme.changes +++ b/atheme.changes @@ -1,3 +1,22 @@ +------------------------------------------------------------------- +Thu Dec 4 08:34:52 UTC 2014 - jengelh@inai.de + +- Update to new upstream release 7.2.1 +* NickServ: +* Make `VHOST` set cloak assigner and timestamp the same way HostServ does +* Make `INFO` call the `user_info_noexist` hook for queries that don't match an account +* Make `REGAIN` log you in if successful. +* Allow implementing custom filters for `LIST` +* nickserv/multimark: new module which allows multiple MARK entries per nickname. +* ChanServ: +* Add a `$server:` exttarget accepting server masks +* Add `PUBACL` flag which allows the channel access to be public. +* Don't allow `DEOP` or `KICK` of a services bot. +* Don't try to expand extbans in various commands. +* Allow users with +O or +V flags to op/voice themselves, since they can regain op/voice + by cycling the channel anyway. +* chanserv/clear_akicks: new module providing a `CLEAR AKICKS` command. + ------------------------------------------------------------------- Thu Oct 9 14:26:52 UTC 2014 - jengelh@inai.de diff --git a/atheme.spec b/atheme.spec index 1c7d54a..d1500a0 100644 --- a/atheme.spec +++ b/atheme.spec @@ -18,7 +18,7 @@ Name: atheme %define lname libathemecore1 -Version: 7.1.0 +Version: 7.2.1 Release: 0 Url: http://atheme.net/ Summary: A portable, secure set of open source, modular IRC services @@ -29,6 +29,7 @@ Group: Productivity/Networking/IRC Source: http://atheme.net/downloads/atheme-services-%version.tar.bz2 Source9: example.conf Patch1: atheme-lockmodes.diff +Patch2: atheme-config.diff Patch3: atheme-nodate.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: cracklib-devel @@ -77,9 +78,11 @@ in %lname. %prep %setup -qn %name-services-%version -%patch -P 1 -P 3 -p1 -# use system libmowgli +%patch -P 1 -P 2 -P 3 -p1 +# use system libmowgli; ignore contrib modules rm -Rf libmowgli-2 +mkdir -p libmowgli-2 modules/contrib +touch libmowgli-2/Makefile modules/contrib/Makefile %build %if 0%{?suse_version} >= 1210