Hello community, here is the log from the commit of package atheme for openSUSE:Factory checked in at 2014-08-11 10:07:39 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/atheme (Old) and /work/SRC/openSUSE:Factory/.atheme.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "atheme" Changes: -------- --- /work/SRC/openSUSE:Factory/atheme/atheme.changes 2014-03-04 13:20:30.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.atheme.new/atheme.changes 2014-08-11 10:07:50.000000000 +0200 @@ -1,0 +2,21 @@ +Sun Jul 20 10:30:48 UTC 2014 - jeng...@inai.de + +- Update to new upstream release 7.1.0 +* ngircd: New protocol module. +* nefarious: Add Nefarious 2 SASL support. +* nefarious: Send account timestamp in svslogin. +* elemental-ircd: New protocol module. +* dreamforge: Remove protocol module. +* inspircd: Add support for server-side MLOCK and TOPICLOCK enforcement +* inspircd: Add support for matching extbans modifying matching logic +* inspircd: Add +H to channel modes +* inspircd: Add +X and +w to list-like mode list +* ircd-seven: Support charybdis extension cmodes on ircd-seven as well. +* ts6-generic: Add support for serverinfo::hidden +* unreal: Add support for extbans. +* unreal: Add cmode +P for permanent channel. +- Remove 0001-build-resolve-compile-warning-in-servtree.c.patch + (merged upstream) +- Delete sysvinit support (keeping the `rcatheme` shortcut, though) + +------------------------------------------------------------------- Old: ---- 0001-build-resolve-compile-warning-in-servtree.c.patch atheme-services-7.0.7.tar.bz2 atheme.init New: ---- atheme-services-7.1.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ atheme.spec ++++++ --- /var/tmp/diff_new_pack.LORiuj/_old 2014-08-11 10:07:51.000000000 +0200 +++ /var/tmp/diff_new_pack.LORiuj/_new 2014-08-11 10:07:51.000000000 +0200 @@ -18,7 +18,7 @@ Name: atheme %define lname libathemecore1 -Version: 7.0.7 +Version: 7.1.0 Release: 0 Url: http://atheme.net/ Summary: A portable, secure set of open source, modular IRC services @@ -27,24 +27,23 @@ #Git-Clone: git://github.com/atheme/atheme Source: http://atheme.net/downloads/atheme-services-%version.tar.bz2 -Source1: atheme.init Source2: atheme.service Source3: atheme-tmpfiles.conf Patch1: atheme-lockmodes.diff Patch2: atheme-config.diff Patch3: atheme-nodate.diff -Patch4: 0001-build-resolve-compile-warning-in-servtree.c.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: cracklib-devel BuildRequires: fdupes BuildRequires: libopenssl-devel BuildRequires: openldap2-devel BuildRequires: pkgconfig -%if 0%{?suse_version} >= 1210 -BuildRequires: systemd -%endif -BuildRequires: pkgconfig(libmowgli-2) >= 2.0.0 +BuildRequires: systemd-rpm-macros +# configure.ac checks for jansson, but it is not yet used in source code +#BuildRequires: pkgconfig(jansson) >= 2.4 +BuildRequires: pkgconfig(libmowgli-2) >= 2.0.0.g185 BuildRequires: pkgconfig(libpcre) +BuildRequires: pkgconfig(libqrencode) %define atheme_home /var/lib/atheme %define atheme_log /var/log/atheme %define atheme_run /var/run/atheme @@ -80,9 +79,9 @@ %prep %setup -qn %name-services-%version -%patch -P 1 -P 2 -P 3 -P 4 -p1 +%patch -P 1 -P 2 -P 3 -p1 # use system libmowgli -rm -Rf libmowgli*; +rm -Rf libmowgli-2 %build %if 0%{?suse_version} >= 1210 @@ -112,15 +111,10 @@ 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 -Dm 0755 "%{S:1}" "$b/%_sysconfdir/init.d/%name"; -ln -sf "%_sysconfdir/init.d/%name" "$b/%_sbindir/rc%name"; - -%if 0%{?_unitdir:1} mkdir -p "$b/%_unitdir" "$b/%_libexecdir/tmpfiles.d"; install -pm0644 "%{S:2}" "$b/%_unitdir/"; install -pm0644 "%{S:3}" "$b/%_libexecdir/tmpfiles.d/atheme.conf"; -%endif +ln -s service "$b/%_sbindir/rcatheme" # config files # TODO: check if we should change any defaults and patch it. @@ -136,54 +130,38 @@ /usr/sbin/useradd -r -g atheme -s /bin/false \ -c "Atheme IRC Services daemon" -d "%atheme_home" \ atheme >/dev/null || :; -%if 0%{?_unitdir:1} %service_add_pre atheme.service -%endif %post -%fillup_and_insserv %name -%if 0%{?_unitdir:1} %service_add_post atheme.service -%endif +systemd-tmpfiles --create atheme.conf || : %preun -%stop_on_removal %name -%if 0%{?_unitdir:1} %service_del_preun atheme.service -%endif %postun -%restart_on_update %name -%insserv_cleanup -%if 0%{?_unitdir:1} %service_del_postun atheme.service -%endif %post -n %lname -p /sbin/ldconfig - %postun -n %lname -p /sbin/ldconfig %files -f %name.lang %defattr(-,root,root) -%_sysconfdir/init.d/%name -%_sbindir/rc%name +%_sbindir/ecdsakeygen %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 +%_sbindir/rcatheme %_libdir/%name %_datadir/%name %doc %_docdir/%name %dir %attr(750,atheme,atheme) %atheme_home %dir %attr(750,atheme,atheme) %atheme_log -%if 0%{?_unitdir:1} %_unitdir/*.service %_libexecdir/tmpfiles.d -%else -%dir %attr(750,atheme,atheme) %atheme_run -%endif %files -n %lname %defattr(-,root,root) ++++++ atheme-config.diff ++++++ --- /var/tmp/diff_new_pack.LORiuj/_old 2014-08-11 10:07:51.000000000 +0200 +++ /var/tmp/diff_new_pack.LORiuj/_new 2014-08-11 10:07:51.000000000 +0200 @@ -4,23 +4,32 @@ Signed-off-by: Jan Engelhardt <jeng...@medozas.de> --- - dist/atheme.conf.example | 46 +++++++++++++++++++++++----------------------- - 1 file changed, 23 insertions(+), 23 deletions(-) + dist/atheme.conf.example | 72 +++++++++++++++++++---------------------------- + 1 file changed, 30 insertions(+), 42 deletions(-) -Index: atheme-services-7.0.5/dist/atheme.conf.example +Index: atheme-services-7.1.0/dist/atheme.conf.example =================================================================== ---- atheme-services-7.0.5.orig/dist/atheme.conf.example -+++ atheme-services-7.0.5/dist/atheme.conf.example -@@ -708,7 +708,7 @@ loadmodule "modules/groupserv/set_url"; +--- atheme-services-7.1.0.orig/dist/atheme.conf.example ++++ atheme-services-7.1.0/dist/atheme.conf.example +@@ -67,7 +67,7 @@ + * If your IRCd vendor has supplied a module file, build it and load it here + * instead of one above. + */ +-#loadmodule "modules/protocol/charybdis"; ++loadmodule "modules/protocol/charybdis"; + + /* Protocol mixins. + * +@@ -749,7 +749,7 @@ loadmodule "modules/groupserv/set_url"; * - * HTTP Server modules/misc/httpd + * HTTP Server modules/misc/httpd */ -loadmodule "modules/misc/httpd"; +#loadmodule "modules/misc/httpd"; /* XMLRPC server module. * -@@ -757,7 +757,7 @@ serverinfo { +@@ -798,7 +798,7 @@ serverinfo { * unique on the IRC network and contain at least one dot, but does * not have to be equal to any DNS name. */ @@ -29,7 +38,7 @@ /* desc * The ``server comment'' we send to the IRC network. -@@ -780,24 +780,24 @@ serverinfo { +@@ -820,24 +820,24 @@ serverinfo { /* (*)netname * The name of your network. */ @@ -56,27 +65,43 @@ - adminemail = "misconfigu...@admin.tld"; + adminemail = "unconfigu...@admin.tld"; - /* (*)mta - * The full path to your mail transfer agent. -@@ -891,7 +891,7 @@ serverinfo { - * Multiple may be defined but only one will be used at a time (IRC - * being a tree shaped network). + /* (*)registeremail + * The email address that messages should be originated from. +@@ -936,12 +936,12 @@ serverinfo { + * To link Atheme over ssl, please connect Atheme to a local ircd and have that + * connect to your network over SSL. */ -uplink "irc.example.net" { +uplink "localhost." { // The server name of the ircd you're linking to goes above. // host -@@ -904,7 +904,7 @@ uplink "irc.example.net" { - - // password - // The password used for linking. + // The hostname to connect to. +- host = "127.0.0.1"; ++ host = "localhost"; + + // vhost + // The source IP to connect from, used on machines with multiple interfaces. +@@ -960,18 +960,6 @@ uplink "irc.example.net" { + port = 6667; + }; + +-/* this is an example for using an IPv6 address as an uplink */ +-uplink "irc6.example.net" { +- host = "::1"; +- +- // password +- // If you want to have same send_password and accept_password, you +- // can specify both using 'password' instead of individually. - password = "linkage"; -+ password = "servicespassword"; - - // port - // The port to connect to. -@@ -962,7 +962,7 @@ nickserv { +- +- port = 6667; +-}; +- + /* Services configuration. + * + * Each of these blocks can contain a nick, user, host, real and aliases. +@@ -1016,7 +1004,7 @@ nickserv { /* (*)host * The hostname we want NickServ to have. */ @@ -85,7 +110,7 @@ /* (*)real * The realname (gecos) information we want NickServ to have. -@@ -1053,7 +1053,7 @@ chanserv { +@@ -1113,7 +1101,7 @@ chanserv { /* (*)host * The hostname we want the client to have. */ @@ -94,7 +119,7 @@ /* (*)real * The GECOS of the client. -@@ -1077,7 +1077,7 @@ chanserv { +@@ -1142,7 +1130,7 @@ chanserv { * use a lot of CPU up, and will only work if you have * join_chans (in general) enabled as well. */ @@ -103,7 +128,7 @@ /* (*) hide_xop * Hide the XOP templates from sight. This is useful if you -@@ -1243,7 +1243,7 @@ global { +@@ -1315,7 +1303,7 @@ global { /* (*)host * The hostname used for this client. */ @@ -112,7 +137,7 @@ /* (*)real * The GECOS (real name) of the client. -@@ -1272,7 +1272,7 @@ infoserv { +@@ -1344,7 +1332,7 @@ infoserv { /* (*)host * The hostname used for this client, */ @@ -121,7 +146,7 @@ /* (*)real * The GECOS (real name) of the client. -@@ -1308,7 +1308,7 @@ operserv { +@@ -1380,7 +1368,7 @@ operserv { /* (*)host * The hostname used for this client. */ @@ -130,7 +155,7 @@ /* (*)real * The GECOS (real name) of the client. -@@ -1349,7 +1349,7 @@ saslserv { +@@ -1421,7 +1409,7 @@ saslserv { /* (*)host * The hostname we want SaslServ to have. */ @@ -139,7 +164,7 @@ /* (*)real * The realname (gecos) information we want SaslServ to have. -@@ -1378,7 +1378,7 @@ memoserv { +@@ -1450,7 +1438,7 @@ memoserv { /* (*)host * The hostname we want MemoServ to have. */ @@ -148,7 +173,7 @@ /* (*)real * The realname (gecos) information we want MemoServ to have. -@@ -1418,7 +1418,7 @@ gameserv { +@@ -1495,7 +1483,7 @@ gameserv { /* (*)host * The hostname used for this client. */ @@ -157,7 +182,7 @@ /* (*)real * The GECOS (real name) of the client. -@@ -1458,7 +1458,7 @@ rpgserv { +@@ -1535,7 +1523,7 @@ rpgserv { /* (*)host * The hostname used for this client. */ @@ -166,7 +191,7 @@ /* (*)real * The GECOS (real name) of the client. -@@ -1533,7 +1533,7 @@ groupserv { +@@ -1610,7 +1598,7 @@ groupserv { /* (*)host * The hostname we want GroupServ to have. */ @@ -175,7 +200,7 @@ /* (*)real * The realname (gecos) information we want GroupServ to have. -@@ -1598,7 +1598,7 @@ hostserv { +@@ -1675,7 +1663,7 @@ hostserv { /* (*)host * The hostname used for this client. */ @@ -184,7 +209,7 @@ /* (*)real * The GECOS (real name) of the client. -@@ -1647,7 +1647,7 @@ helpserv { +@@ -1724,7 +1712,7 @@ helpserv { /* (*)host * The hostname we want HelpServ to have. */ @@ -193,7 +218,7 @@ /* (*)real * The realname (gecos) information we want HelpServ to have. -@@ -1701,7 +1701,7 @@ alis { +@@ -1778,7 +1766,7 @@ alis { /* (*)host * The hostname we want ALIS to have. */ @@ -202,7 +227,50 @@ /* (*)real * The realname (gecos) information we want ALIS to have. -@@ -1869,7 +1869,7 @@ general { +@@ -1798,18 +1786,18 @@ httpd { + * The host that the HTTP server will listen on. + * Use 0.0.0.0 if you want to listen on all available hosts. + */ +- host = "0.0.0.0"; ++ #host = "0.0.0.0"; + + /* host (ipv6) + * If you want, you can have Atheme listen on an IPv6 host too. + * Use :: if you want to listen on all available IPv6 hosts. + */ +- #host = "::"; ++ host = "::"; + + /* www_root + * The directory that contains the files that should be served by the httpd. + */ +- www_root = "/var/www"; ++ www_root = "/usr/lib/atheme/www"; + + /* port + * The port that the HTTP server will listen on. +@@ -1870,17 +1858,17 @@ ldap { + * This block logs all account and channel registrations and drops, + * and account and channel setting changes to var/account.log. + */ +-logfile "var/account.log" { register; set; }; ++logfile "/var/log/ateme/account.log" { register; set; }; + + /* + * This block logs all command use to var/commands.log. + */ +-logfile "var/commands.log" { commands; }; ++logfile "/var/log/atheme/commands.log" { commands; }; + + /* + * This block logs all security auditing information. + */ +-logfile "var/audit.log" { denycmd; }; ++logfile "/var/log/atheme/audit.log" { denycmd; }; + + /* + * You can log to IRC channels, and even split it by category, too. +@@ -1963,7 +1951,7 @@ general { * network channels by keeping them open, and to preserve the * topic and +beI lists. */ ++++++ atheme-nodate.diff ++++++ --- /var/tmp/diff_new_pack.LORiuj/_old 2014-08-11 10:07:51.000000000 +0200 +++ /var/tmp/diff_new_pack.LORiuj/_new 2014-08-11 10:07:51.000000000 +0200 @@ -4,45 +4,41 @@ __DATE__ is not desired; causes unnecessary rebuilds. --- - libathemecore/ctcp-common.c | 4 ++-- - libathemecore/ptasks.c | 4 ++-- + libathemecore/ctcp-common.c | 2 +- + libathemecore/ptasks.c | 2 +- modules/operserv/uptime.c | 2 +- - 3 files changed, 5 insertions(+), 5 deletions(-) + 3 files changed, 3 insertions(+), 3 deletions(-) -Index: atheme-services-7.0.5/libathemecore/ctcp-common.c +Index: atheme-services-7.1.0/libathemecore/ctcp-common.c =================================================================== ---- atheme-services-7.0.5.orig/libathemecore/ctcp-common.c -+++ atheme-services-7.0.5/libathemecore/ctcp-common.c -@@ -41,8 +41,8 @@ static void ctcp_ping_handler(sourceinfo - static void ctcp_version_handler(sourceinfo_t *si, char *cmd, char *args) - { +--- 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] Build Date: %s\001", -- PACKAGE_STRING, revision, me.name, get_conf_opts(), ircd->ircdname, __DATE__); -+ "\001VERSION %s. %s %s %s [%s] Build Date: irrelevant\001", -+ PACKAGE_STRING, revision, me.name, get_conf_opts(), ircd->ircdname); + "\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"); } static void ctcp_clientinfo_handler(sourceinfo_t *si, char *cmd, char *args) -Index: atheme-services-7.0.5/libathemecore/ptasks.c +Index: atheme-services-7.1.0/libathemecore/ptasks.c =================================================================== ---- atheme-services-7.0.5.orig/libathemecore/ptasks.c -+++ atheme-services-7.0.5/libathemecore/ptasks.c -@@ -49,8 +49,8 @@ void handle_version(user_t *u) - if (floodcheck(u, NULL)) +--- 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] Build Date: %s", -- PACKAGE_STRING, me.name, revision, get_conf_opts(), ircd->ircdname, __DATE__); -+ numeric_sts(me.me, 351, u, "%s. %s %s :%s [%s] Build Date: irrelevant", -+ PACKAGE_STRING, me.name, revision, get_conf_opts(), ircd->ircdname); + 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.0.5/modules/operserv/uptime.c +Index: atheme-services-7.1.0/modules/operserv/uptime.c =================================================================== ---- atheme-services-7.0.5.orig/modules/operserv/uptime.c -+++ atheme-services-7.0.5/modules/operserv/uptime.c +--- atheme-services-7.1.0.orig/modules/operserv/uptime.c ++++ atheme-services-7.1.0/modules/operserv/uptime.c @@ -33,7 +33,7 @@ static void os_cmd_uptime(sourceinfo_t * { logcommand(si, CMDLOG_GET, "UPTIME"); ++++++ atheme-services-7.0.7.tar.bz2 -> atheme-services-7.1.0.tar.bz2 ++++++ ++++ 93864 lines of diff (skipped) ++++++ atheme.service ++++++ --- /var/tmp/diff_new_pack.LORiuj/_old 2014-08-11 10:07:53.000000000 +0200 +++ /var/tmp/diff_new_pack.LORiuj/_new 2014-08-11 10:07:53.000000000 +0200 @@ -2,7 +2,7 @@ Description=Atheme IRC Services [Service] -ExecStart=/usr/sbin/atheme-services +ExecStart=/usr/sbin/atheme-services -n User=atheme Group=atheme -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
