April 2014 - openSUSE Commits - openSUSE Mailing Lists

commit yast2-ntp-client for openSUSE:Factory
by root＠hilbert.suse.de 26 Apr '14

26 Apr '14

Hello community, here is the log from the commit of package yast2-ntp-client for openSUSE:Factory checked in at 2014-04-26 11:44:55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-ntp-client (Old) and /work/SRC/openSUSE:Factory/.yast2-ntp-client.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-ntp-client" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-ntp-client/yast2-ntp-client.changes 2014-04-05 14:43:10.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-ntp-client.new/yast2-ntp-client.changes 2014-04-26 11:44:55.000000000 +0200 @@ -1,0 +2,6 @@ +Tue Apr 15 09:58:18 CEST 2014 - locilka(a)suse.com + +- Fixed evaluation of starting the NTP service (bnc#872389) +- 3.1.8 + +------------------------------------------------------------------- Old: ---- yast2-ntp-client-3.1.7.tar.bz2 New: ---- yast2-ntp-client-3.1.8.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-ntp-client.spec ++++++ --- /var/tmp/diff_new_pack.kxEHeC/_old 2014-04-26 11:44:56.000000000 +0200 +++ /var/tmp/diff_new_pack.kxEHeC/_new 2014-04-26 11:44:56.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-ntp-client -Version: 3.1.7 +Version: 3.1.8 Release: 0 Summary: YaST2 - NTP Client Configuration License: GPL-2.0+ ++++++ yast2-ntp-client-3.1.7.tar.bz2 -> yast2-ntp-client-3.1.8.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ntp-client-3.1.7/package/yast2-ntp-client.changes new/yast2-ntp-client-3.1.8/package/yast2-ntp-client.changes --- old/yast2-ntp-client-3.1.7/package/yast2-ntp-client.changes 2014-04-03 14:25:50.000000000 +0200 +++ new/yast2-ntp-client-3.1.8/package/yast2-ntp-client.changes 2014-04-15 10:11:35.000000000 +0200 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Apr 15 09:58:18 CEST 2014 - locilka(a)suse.com + +- Fixed evaluation of starting the NTP service (bnc#872389) +- 3.1.8 + +------------------------------------------------------------------- Thu Apr 3 11:52:14 UTC 2014 - jreidinger(a)suse.com - change path for ntptimeset(bnc#871367) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ntp-client-3.1.7/package/yast2-ntp-client.spec new/yast2-ntp-client-3.1.8/package/yast2-ntp-client.spec --- old/yast2-ntp-client-3.1.7/package/yast2-ntp-client.spec 2014-04-03 14:25:50.000000000 +0200 +++ new/yast2-ntp-client-3.1.8/package/yast2-ntp-client.spec 2014-04-15 10:11:35.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-ntp-client -Version: 3.1.7 +Version: 3.1.8 Release: 0 Summary: YaST2 - NTP Client Configuration License: GPL-2.0+ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ntp-client-3.1.7/src/modules/NtpClient.rb new/yast2-ntp-client-3.1.8/src/modules/NtpClient.rb --- old/yast2-ntp-client-3.1.7/src/modules/NtpClient.rb 2014-04-03 14:25:50.000000000 +0200 +++ new/yast2-ntp-client-3.1.8/src/modules/NtpClient.rb 2014-04-15 10:11:35.000000000 +0200 @@ -870,11 +870,15 @@ Report.Error(Message.CannotAdjustService("NTP")) end - if @run_service && !@write_only && Service.Restart(@service_name) - # error report - Report.Error(_("Cannot restart the NTP daemon.")) + if @run_service + unless @write_only + # error report + Report.Error(_("Cannot restart the NTP daemon.")) unless Service.Restart(@service_name) + end + else + Service.Stop(@service_name) end - Service.Stop(@service_name) if !@run_service + if @synchronize_time SCR.Write( path(".target.string"), -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yum for openSUSE:Factory
by root＠hilbert.suse.de 26 Apr '14

26 Apr '14

Hello community, here is the log from the commit of package yum for openSUSE:Factory checked in at 2014-04-26 11:44:53 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yum (Old) and /work/SRC/openSUSE:Factory/.yum.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yum" Changes: -------- --- /work/SRC/openSUSE:Factory/yum/yum.changes 2014-03-15 17:35:53.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.yum.new/yum.changes 2014-04-26 11:44:54.000000000 +0200 @@ -1,0 +2,8 @@ +Mon Apr 14 12:54:31 UTC 2014 - adrian(a)suse.de + +- fix "repotag" support in modifyrepo + new patch: yum-3.4.3-fix-repo-tag.patch +- include debian build descriptions, since we require this + for travis-ci testing + +------------------------------------------------------------------- New: ---- debian.changelog debian.rules debian.series debian.tar.gz yum-3.4.3-fix-repo-tag.patch yum.dsc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yum.spec ++++++ --- /var/tmp/diff_new_pack.HcUBhb/_old 2014-04-26 11:44:55.000000000 +0200 +++ /var/tmp/diff_new_pack.HcUBhb/_new 2014-04-26 11:44:55.000000000 +0200 @@ -38,6 +38,8 @@ Patch7: %{name}-3.4.3-updatesd-dbus-conf-syntax.patch # PATCH-FIX-UPSTREAM Patch8: %{name}-3.4.3-speedup-bnc810074.patch +# PATCH-FIX-OPENSUSE +Patch9: %{name}-3.4.3-fix-repo-tag.patch BuildRequires: dbus-1 BuildRequires: intltool BuildRequires: python-devel @@ -93,10 +95,11 @@ %setup -q %patch1 -p1 %patch2 -p1 -%patch3 +%patch3 -p1 %patch6 -p1 %patch7 -p1 %patch8 -p1 +%patch9 -p1 # Fix non-executable scripts rpmlint issue: sed -i "s|#!.*/usr/bin/python.*||" rpmUtils/{arch,__init__,miscutils,oldUtils,transaction,updates}.py ++++++ debian.changelog ++++++ yum (2011.10.10-1) unstable; urgency=low * initial debian packaging for travis -- Adrian Schroeter <adrian(a)suse.de> Tue, 11 Jun 2013 19:30:22 +0200 ++++++ debian.rules ++++++ #!/usr/bin/make -f # -*- makefile -*- # Sample debian/rules that uses debhelper. # This file was originally written by Joey Hess and Craig Small. # As a special exception, when this file is copied by dh-make into a # dh-make output file, you may use that output file without restriction. # This special exception was added by Craig Small in version 0.37 of dh-make. # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany # This file and all modifications and additions to the pristine package # are under the same license as the package itself. # # Please submit bugfixes or commens via http://bugs.opensuse.org # Uncomment this to turn on verbose mode. export DH_VERBOSE=1 configure: configure-stamp configure-stamp: touch configure-stamp build: build-stamp build-stamp: configure-stamp touch build-stamp clean: dh $@ install: install-stamp install-stamp: dh install dh_perl dh_gencontrol -a dh_md5sums -a dh_builddeb -a touch $@ override_dh_auto_test: true override_dh_auto_install: make install DESTDIR=/.build.packages/BUILD/debian/yum cd yum && make install 'PKGDIR=$$(PYLIBDIR)/$$(PACKAGE)' DESTDIR=/.build.packages/BUILD/debian/yum cd rpmUtils && make install 'PKGDIR=$$(PYLIBDIR)/$$(PACKAGE)' DESTDIR=/.build.packages/BUILD/debian/yum binary-arch: binary-indep: install dh $@ binary: binary-arch binary-indep .PHONY: binary binary-arch binary-indep install clean build ++++++ debian.series ++++++ # Patch series file for quilt, created by quilt setup # Source: yum-3.4.3.tar.gz # Patchdir: yum-3.4.3 # yum-3.4.3-license-to-confirm.patch yum-3.4.3-suse-changelogs.patch yum-3.4.3-suse-missing-tags.patch yum-3.4.3-add-lib-cpp-file.patch yum-3.4.3-updatesd-dbus-conf-syntax.patch yum-3.4.3-speedup-bnc810074.patch yum-3.4.3-fix-repo-tag.patch ++++++ yum-3.4.3-fix-repo-tag.patch ++++++ --- a/yum/repoMDObject.py.orig 2014-04-14 16:38:41.520300670 +0000 +++ b/yum/repoMDObject.py 2014-04-14 16:40:58.680570788 +0000 @@ -187,6 +187,8 @@ class RepoMD: child_name = ns_cleanup(child.tag) if child_name == 'content': self.tags['content'].add(child.text) + if child_name == 'repo': + self.tags['repo'].add(child.text) if child_name == 'distro': cpeid = child.attrib.get('cpeid', '') distro = self.tags['distro'].setdefault(cpeid,set()) @@ -218,6 +220,8 @@ class RepoMD: print 'revision: %s' % self.revision if self.tags['content']: print 'tags content: %s' % ", ".join(sorted(self.tags['content'])) + if self.tags['repo']: + print 'tags repo: %s' % ", ".join(sorted(self.tags['repo'])) if self.tags['distro']: for distro in sorted(self.tags['distro']): print 'tags distro: %s' % distro ++++++ yum-3.4.3-suse-missing-tags.patch ++++++ --- /var/tmp/diff_new_pack.HcUBhb/_old 2014-04-26 11:44:55.000000000 +0200 +++ /var/tmp/diff_new_pack.HcUBhb/_new 2014-04-26 11:44:55.000000000 +0200 @@ -1,5 +1,5 @@ ---- ./yum/mdparser.py.orig 2014-03-13 11:04:20.753615026 +0000 -+++ ./yum/mdparser.py 2014-03-13 11:04:51.698614971 +0000 +--- a/yum/mdparser.py.orig 2014-03-13 11:04:20.753615026 +0000 ++++ b/yum/mdparser.py 2014-03-13 11:04:51.698614971 +0000 @@ -155,7 +155,8 @@ class PrimaryEntry(BaseEntry): p[name] = child.text ++++++ yum.dsc ++++++ Format: 1.0 Source: yum Version: 3.4.3 Binary: yum Maintainer: Adrian Schroeter <adrian(a)suse.de> Architecture: all Standards-Version: 3.7.2 Build-Depends: debhelper (>= 4), python-dev, python-libxml2, python-rpm, python-urlgrabber, python-sqlitecachec -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yast2-iscsi-client for openSUSE:Factory
by root＠hilbert.suse.de 26 Apr '14

26 Apr '14

Hello community, here is the log from the commit of package yast2-iscsi-client for openSUSE:Factory checked in at 2014-04-26 11:44:52 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-iscsi-client (Old) and /work/SRC/openSUSE:Factory/.yast2-iscsi-client.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-iscsi-client" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-iscsi-client/yast2-iscsi-client.changes 2014-04-13 13:13:15.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-iscsi-client.new/yast2-iscsi-client.changes 2014-04-26 11:44:53.000000000 +0200 @@ -1,0 +2,7 @@ +Mon Apr 14 12:28:33 CEST 2014 - gs(a)suse.de + +- reintroduce exception in case of socket not found + (Requires: open-iscsi is bug-fix for bnc #872049) +- 3.1.6 + +------------------------------------------------------------------- Old: ---- yast2-iscsi-client-3.1.5.tar.bz2 New: ---- yast2-iscsi-client-3.1.6.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-iscsi-client.spec ++++++ --- /var/tmp/diff_new_pack.i9IxIp/_old 2014-04-26 11:44:54.000000000 +0200 +++ /var/tmp/diff_new_pack.i9IxIp/_new 2014-04-26 11:44:54.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-iscsi-client -Version: 3.1.5 +Version: 3.1.6 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ yast2-iscsi-client-3.1.5.tar.bz2 -> yast2-iscsi-client-3.1.6.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-iscsi-client-3.1.5/package/yast2-iscsi-client.changes new/yast2-iscsi-client-3.1.6/package/yast2-iscsi-client.changes --- old/yast2-iscsi-client-3.1.5/package/yast2-iscsi-client.changes 2014-04-09 12:00:48.000000000 +0200 +++ new/yast2-iscsi-client-3.1.6/package/yast2-iscsi-client.changes 2014-04-14 13:23:39.000000000 +0200 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Mon Apr 14 12:28:33 CEST 2014 - gs(a)suse.de + +- reintroduce exception in case of socket not found + (Requires: open-iscsi is bug-fix for bnc #872049) +- 3.1.6 + +------------------------------------------------------------------- Tue Apr 8 14:37:23 CEST 2014 - gs(a)suse.de - don't throw exception if socket not found (bnc #872049) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-iscsi-client-3.1.5/package/yast2-iscsi-client.spec new/yast2-iscsi-client-3.1.6/package/yast2-iscsi-client.spec --- old/yast2-iscsi-client-3.1.5/package/yast2-iscsi-client.spec 2014-04-09 12:00:48.000000000 +0200 +++ new/yast2-iscsi-client-3.1.6/package/yast2-iscsi-client.spec 2014-04-14 13:23:39.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-iscsi-client -Version: 3.1.5 +Version: 3.1.6 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-iscsi-client-3.1.5/src/modules/IscsiClientLib.rb new/yast2-iscsi-client-3.1.6/src/modules/IscsiClientLib.rb --- old/yast2-iscsi-client-3.1.5/src/modules/IscsiClientLib.rb 2014-04-09 12:00:48.000000000 +0200 +++ new/yast2-iscsi-client-3.1.6/src/modules/IscsiClientLib.rb 2014-04-14 13:23:40.000000000 +0200 @@ -999,7 +999,8 @@ startIScsid else # find socket (only in installed system) - @iscsid_socket = SystemdSocket.find("iscsid") + # throw exception if socket not found + @iscsid_socket = SystemdSocket.find!("iscsid") @serviceStatus = true if Service.Status("iscsi") == 0 @socketStatus = true if iscsidSocketActive? -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yast2-services-manager for openSUSE:Factory
by root＠hilbert.suse.de 26 Apr '14

26 Apr '14

Hello community, here is the log from the commit of package yast2-services-manager for openSUSE:Factory checked in at 2014-04-26 11:44:51 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-services-manager (Old) and /work/SRC/openSUSE:Factory/.yast2-services-manager.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-services-manager" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-services-manager/yast2-services-manager.changes 2014-03-21 12:14:17.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.yast2-services-manager.new/yast2-services-manager.changes 2014-04-26 11:44:52.000000000 +0200 @@ -1,0 +2,7 @@ +Thu Apr 10 14:31:57 UTC 2014 - vmoravec(a)suse.com + +- Add support for legacy runlevel autoyast profile and improve + profile specifications (bnc#865347) +- 3.1.12 + +------------------------------------------------------------------- Old: ---- yast2-services-manager-3.1.11.tar.bz2 New: ---- yast2-services-manager-3.1.12.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-services-manager.spec ++++++ --- /var/tmp/diff_new_pack.2bLswL/_old 2014-04-26 11:44:52.000000000 +0200 +++ /var/tmp/diff_new_pack.2bLswL/_new 2014-04-26 11:44:52.000000000 +0200 @@ -24,8 +24,9 @@ ###################################################################### Name: yast2-services-manager -Version: 3.1.11 +Version: 3.1.12 Release: 0 + BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -38,6 +39,7 @@ Conflicts: yast2-installation < 3.1.32 Obsoletes: yast2-runlevel +Conflicts: yast2-runlevel BuildRequires: ruby BuildRequires: update-desktop-files @@ -82,6 +84,7 @@ %dir %{yast_dir}/lib/ %{yast_dir}/lib/services-manager/ %{_prefix}/share/applications/YaST2/services-manager.desktop +%{_prefix}/share/applications/YaST2/runlevel.desktop %dir %_docdir/ %_docdir/%name/ ++++++ yast2-services-manager-3.1.11.tar.bz2 -> yast2-services-manager-3.1.12.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-services-manager-3.1.11/README.md new/yast2-services-manager-3.1.12/README.md --- old/yast2-services-manager-3.1.11/README.md 2014-03-18 14:51:41.000000000 +0100 +++ new/yast2-services-manager-3.1.12/README.md 2014-04-14 13:07:39.000000000 +0200 @@ -2,8 +2,59 @@ Systemd target and services configuration library for Yast -Running -======= +## Autoyast profile - sudo yast2 services-manager +### Current profile for services and default target + +```xml +<services-manager> + <default_target>multi-user</default_target> + <services> + <enable config:type="list"> + <service>postfix</service> + <service>rsyslog</service> + <service>sshd</service> + </enable> + <disable config:type="list"> + <service>libvirtd</service> + </disable> + </services> + </services-manager> +``` +### Legacy runlevel profile [DEPRECATED] + +```xml +<runlevel> + <default>3</default> + <services config:type="list"> + <service> + <service_name>sshd</service_name> + <service_status>enable</service_status> + <service_start>3</service_start> + </service> + </services> +</runlevel> +``` + +### Legacy list of services [DEPRECATED] + +```xml + <services-manager> + <default_target>multi-user</default_target> + <services config:type="list"> + <service>cron</service> + <service>postfix</service> + <service>rsyslog</service> + <service>sshd</service> + </services> + </services-manager> +``` + +## Running + +`sudo yast services-manager` + +or + +`sudo yast services` diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-services-manager-3.1.11/package/yast2-services-manager.changes new/yast2-services-manager-3.1.12/package/yast2-services-manager.changes --- old/yast2-services-manager-3.1.11/package/yast2-services-manager.changes 2014-03-18 14:51:41.000000000 +0100 +++ new/yast2-services-manager-3.1.12/package/yast2-services-manager.changes 2014-04-14 13:07:39.000000000 +0200 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Thu Apr 10 14:31:57 UTC 2014 - vmoravec(a)suse.com + +- Add support for legacy runlevel autoyast profile and improve + profile specifications (bnc#865347) +- 3.1.12 + +------------------------------------------------------------------- Tue Mar 18 13:37:40 UTC 2014 - vmoravec(a)suse.com - Do not crash installation with empty services list (bnc#868614) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-services-manager-3.1.11/package/yast2-services-manager.spec new/yast2-services-manager-3.1.12/package/yast2-services-manager.spec --- old/yast2-services-manager-3.1.11/package/yast2-services-manager.spec 2014-03-18 14:51:41.000000000 +0100 +++ new/yast2-services-manager-3.1.12/package/yast2-services-manager.spec 2014-04-14 13:07:39.000000000 +0200 @@ -24,7 +24,8 @@ ###################################################################### Name: yast2-services-manager -Version: 3.1.11 +Version: 3.1.12 + Release: 0 BuildArch: noarch @@ -38,6 +39,7 @@ Conflicts: yast2-installation < 3.1.32 Obsoletes: yast2-runlevel +Conflicts: yast2-runlevel BuildRequires: ruby BuildRequires: update-desktop-files @@ -82,6 +84,7 @@ %dir %{yast_dir}/lib/ %{yast_dir}/lib/services-manager/ %{_prefix}/share/applications/YaST2/services-manager.desktop +%{_prefix}/share/applications/YaST2/runlevel.desktop %dir %_docdir/ %_docdir/%name/ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-services-manager-3.1.11/src/autoyast_rnc/services-manager.rnc new/yast2-services-manager-3.1.12/src/autoyast_rnc/services-manager.rnc --- old/yast2-services-manager-3.1.11/src/autoyast_rnc/services-manager.rnc 2014-03-18 14:51:41.000000000 +0100 +++ new/yast2-services-manager-3.1.12/src/autoyast_rnc/services-manager.rnc 2014-04-14 13:07:39.000000000 +0200 @@ -2,15 +2,57 @@ namespace a = "http://relaxng.org/ns/compatibility/annotations/1.0" namespace config = "http://www.suse.com/1.0/configns" +# runlevel legacy schema + +runlevel_service_name = element service_name { text } +runlevel_service_status = element service_status { text } +runlevel_service_start = element service_start { text } +runlevel_service_stop = element service_stop { text } + +runlevel_service = + element service { + attribute config:type { text }? & + runlevel_service_name? & + runlevel_service_start? & + runlevel_service_stop? & + runlevel_service_status? + } + +runlevel_services = + element services { + attribute config:type { "list" }?, + runlevel_service* + } + +runlevel_default = element \default { text } + +runlevel_content = element runlevel { runlevel_default? & runlevel_services? } + +# current services-manager schema + service = element service { text } -services = element services { - attribute config:type { text }?, - service* -} +enabled = + element enabled { + attribute config:type { text }? & + service* + } + +disabled = + element disabled { + attribute config:type { text }? & + service* + } + +services = + element services { attribute config:type { text }? & enabled } | + element services { attribute config:type { text }? & disabled } | + element services { attribute config:type { text }? & service* } default_target = element default_target { text } -services-manager = element services-manager { - default_target? & services? -} +services_manager_content = default_target? & services? + +services-manager = + element services-manager { services_manager_content } | + element runlevel { runlevel_content } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-services-manager-3.1.11/src/desktop/runlevel.desktop new/yast2-services-manager-3.1.12/src/desktop/runlevel.desktop --- old/yast2-services-manager-3.1.11/src/desktop/runlevel.desktop 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-services-manager-3.1.12/src/desktop/runlevel.desktop 2014-04-14 13:07:39.000000000 +0200 @@ -0,0 +1,23 @@ +[Desktop Entry] +Type=Application +Categories=Settings;System;Qt;X-SuSE-YaST;X-SuSE-YaST-System; + +X-KDE-ModuleType=Library +X-KDE-HasReadOnlyMode=true +X-KDE-Library=yast2 +X-SuSE-YaST-Call=services-manager +X-SuSE-YaST-AutoInstClient=services-manager_auto + +X-SuSE-YaST-Group=System +X-SuSE-YaST-Argument= +X-SuSE-YaST-RootOnly=true +X-SuSE-YaST-AutoInst=all +X-SuSE-YaST-Geometry= +X-SuSE-YaST-SortKey= + +Icon=yast-runlevel +Exec=xdg-su -c "/sbin/yast2 services-manager" + +Name=Services Manager +GenericName=Configure running services and the default target +StartupNotify=true diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-services-manager-3.1.11/src/lib/services-manager/services_manager_profile.rb new/yast2-services-manager-3.1.12/src/lib/services-manager/services_manager_profile.rb --- old/yast2-services-manager-3.1.11/src/lib/services-manager/services_manager_profile.rb 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-services-manager-3.1.12/src/lib/services-manager/services_manager_profile.rb 2014-04-14 13:07:39.000000000 +0200 @@ -0,0 +1,155 @@ +module Yast + import "Report" + + ### Supported profiles + # + # @example Extended profile with list of services to be enabled and disabled + # + # <services-manager> + # <default_target>multi-user</default_target> + # <services> + # <enable config:type="list"> + # <service>at</service> + # <service>cron</service> + # <service>nscd</service> + # <service>openct</service> + # <service>postfix</service> + # <service>rsyslog</service> + # <service>sshd</service> + # </enable> + # <disable config:type="list"> + # <service>libvirtd</service> + # </disable> + # </services> + # </services-manager> + # + # @deprecated Legacy profile with incomplete support for services + # @example Simple list of services + # Supported are only services to be enabled. This profile is missing + # services which are going to be disabled. + # + # <services-manager> + # <default_target>multi-user</default_target> + # <services config:type="list"> + # <service>cron</service> + # <service>postfix</service> + # <service>sshd</service> + # </services> + # </services-manager> + # + # @deprecated Legacy runlevel profile + # @example Runlevel profle + # + # <runlevel> + # <default>3</default> + # <services config:type="list"> + # <service> + # <service_name>sshd</service_name> + # <service_status>enable</service_status> + # <service_start>3</service_start> + # </service> + # </services> + # </runlevel> + # + ### + + class ServicesManagerProfile + include Yast::Logger + + ENABLE = 'enable' + DISABLE = 'disable' + + # Service object with two attributes: + # @attr [String] name of the service unit. Suffix '.service' is optional. + # @attr [String] required status on the target system. Can be 'enable' or 'disable'. + Service = Struct.new(:name, :status) + + # Profile data passed from autoyast, a Hash expected + # @return [Hash] + attr_reader :autoyast_profile + + # List of Service structs + # @return [Array<Service>] + attr_reader :services + + # Name of the systemd default target unit. Suffix '.target' is optional. + # @return [String] if the target has been specified in the profile. Can be nil. + attr_reader :target + + def initialize autoyast_profile + @autoyast_profile = autoyast_profile + @services = [] + extract_services + extract_target + end + + private + + def extract_services + services = autoyast_profile['services'] + return if services.nil? || services.empty? + + if services.all? {|item| item.is_a?(::String) } + load_from_simple_list(services) + elsif services.is_a?(Hash) && ( services.key?(ENABLE) || services.key?(DISABLE)) + load_from_extended_list(services) + elsif services.all? {|i| i.is_a?(Hash) && (i.key?('service_name') || i.key?('service_status')) } + load_from_runlevel_list(services) + else + Yast::Report.Error _("Unknown autoyast services profile schema for 'services-manager'") + return + end + log.info "Extracted services from autoyast profile: #{self.services}" + end + + def extract_target + if autoyast_profile.key?('default_target') + @target = autoyast_profile['default_target'] + elsif autoyast_profile.key?('default') + @target = case autoyast_profile['default'] + when "2", "3", "4" + "multi-user" + when "5" + "graphical" + when "0" + log.error "You can't set the default target to 'poweroff' in autoyast profile" + nil + when "1" + log.error "You can't set the default target to 'rescue' in autoyast profile" + nil + else + log.error "Target '#{autoyast_profile['default']}' is not valid" + nil + end + end + end + + def load_from_simple_list services + self.services.concat( + services.map {|service_name| Service.new(service_name, ENABLE)} + ) + end + + def load_from_runlevel_list services + self.services.concat( + services.map do |service| + Service.new(service['service_name'], service['service_status']) + end + ) + end + + def load_from_extended_list services + self.services.concat( + services.fetch(ENABLE, []).map do |service_name| + Service.new(service_name, ENABLE) + end + ) + + self.services.concat( + services.fetch(DISABLE, []).map do |service_name| + Service.new(service_name, DISABLE) + end + ) + end + end +end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-services-manager-3.1.11/src/modules/services_manager.rb new/yast2-services-manager-3.1.12/src/modules/services_manager.rb --- old/yast2-services-manager-3.1.11/src/modules/services_manager.rb 2014-03-18 14:51:41.000000000 +0100 +++ new/yast2-services-manager-3.1.12/src/modules/services_manager.rb 2014-04-14 13:07:39.000000000 +0200 @@ -1,4 +1,5 @@ require 'yast' +require 'services-manager/services_manager_profile' module Yast import "ServicesManagerTarget" @@ -23,8 +24,9 @@ end def import data - ServicesManagerTarget.import data[TARGET] - ServicesManagerService.import data[SERVICES] + profile = ServicesManagerProfile.new(data) + ServicesManagerTarget.import(profile) + ServicesManagerService.import(profile) end def reset diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-services-manager-3.1.11/src/modules/services_manager_service.rb new/yast2-services-manager-3.1.12/src/modules/services_manager_service.rb --- old/yast2-services-manager-3.1.11/src/modules/services_manager_service.rb 2014-03-18 14:51:41.000000000 +0100 +++ new/yast2-services-manager-3.1.12/src/modules/services_manager_service.rb 2014-04-14 13:07:39.000000000 +0200 @@ -233,23 +233,23 @@ exported_services.keys end - def import imported_services=[] - if imported_services.nil? || imported_services.empty? - Builtins.y2error("No services for import provided.") - return false - end - Builtins.y2milestone("Imported services: #{imported_services}") + def import profile + Builtins.y2milestone("List of services from autoyast profile: #{profile.services.map(&:name)}") non_existent_services = [] - # All imported will be enabled - imported_services.each do |service| - if exists?(service) - enable(service) + profile.services.each do |service| + case service.status + when 'enable' + exists?(service.name) ? enable(service.name) : non_existent_services << service.name + when 'disable' + exists?(service.name) ? disable(service.name) : non_existent_services << service.name else - non_existent_services << service - Builtins.y2error("Service '#{service}' doesn't exist on this system") + Builtins.y2error("Unknown status '#{service.status}' for service '#{service.name}'") end end - non_existent_services.empty? + return true if non_existent_services.empty? + + Builtins.y2error("Services #{non_existent_services.inspect} don't exist on this system") + false end # Saves the current configuration in memory diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-services-manager-3.1.11/src/modules/services_manager_target.rb new/yast2-services-manager-3.1.12/src/modules/services_manager_target.rb --- old/yast2-services-manager-3.1.11/src/modules/services_manager_target.rb 2014-03-18 14:51:41.000000000 +0100 +++ new/yast2-services-manager-3.1.12/src/modules/services_manager_target.rb 2014-04-14 13:07:39.000000000 +0200 @@ -65,12 +65,9 @@ default_target end - def import new_target - if new_target.to_s.empty? - Builtins.y2error("New default target not provided") - return - end - self.default_target = new_target + def import profile + return false if profile.target.nil? || profile.target.empty? + self.default_target = profile.target end def inspect diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-services-manager-3.1.11/test/services_manager_profile_test.rb new/yast2-services-manager-3.1.12/test/services_manager_profile_test.rb --- old/yast2-services-manager-3.1.11/test/services_manager_profile_test.rb 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-services-manager-3.1.12/test/services_manager_profile_test.rb 2014-04-14 13:07:39.000000000 +0200 @@ -0,0 +1,142 @@ +#!/usr/bin/env rspec + +require_relative "test_helper" + +require 'services-manager/services_manager_profile' + +module Yast + describe ServicesManagerProfile do + attr_reader :profile, :autoyast_profile + + context "legacy runlevel autoyast profile" do + before do + @autoyast_profile = { + 'default' => '3', + 'services' => [ + { + 'service_name' => 'sshd', + 'service_status' => 'enable', + 'service_start' => '3' + }, + { + 'service_name' => 'libvirt', + 'service_status' => 'disable', + 'service_start' => '5' + }, + ] + } + @profile = ServicesManagerProfile.new(autoyast_profile) + end + + it "returns profile object with services collection" do + expect(profile.services).not_to be_empty + expect(profile.services.size).to eq(2) + end + + it "provides the original data from autoyast" do + expect(profile.autoyast_profile).to equal(autoyast_profile) + end + + it "provides collection of services to be enabled" do + service = profile.services.find {|s| s.name == 'sshd'} + expect(service).not_to be_nil + expect(service.status).to eq('enable') + end + + it "provides collection of services to be disabled" do + service = profile.services.find {|s| s.name == 'libvirt'} + expect(service).not_to be_nil + expect(service.status).to eq('disable') + end + + it "provides default target" do + expect(profile.target).not_to be_empty + expect(profile.target).to eq('multi-user') + end + end + + context "simplified services profile" do + before do + @autoyast_profile = { + 'default_target'=>'graphical', + 'services' => [ 'sshd', 'iscsi' ] + } + @profile = ServicesManagerProfile.new(autoyast_profile) + end + + it "returns profile object that provides services collection" do + expect(profile.services).not_to be_empty + expect(profile.services.size).to eq(2) + end + + it "provides the original data from autoyast" do + expect(profile.autoyast_profile).to equal(autoyast_profile) + end + + it "provides collection of services to be enabled" do + service = profile.services.find {|s| s.name == 'sshd'} + expect(service).not_to be_nil + expect(service.status).to eq('enable') + end + + it "provides default target" do + expect(profile.target).not_to be_empty + expect(profile.target).to eq('graphical') + end + end + + context "extended services autoyast profile" do + before do + @autoyast_profile = { + 'default_target' => 'multi-user', + 'services' => { + 'enable' => ['sshd', 'iscsi' ], + 'disable' => ['nginx', 'libvirt'] + } + } + @profile = ServicesManagerProfile.new(autoyast_profile) + end + + it "returns profile object that provides services collection" do + expect(profile.services).not_to be_empty + expect(profile.services.size).to eq(4) + end + + it "provides the original data from autoyast" do + expect(profile.autoyast_profile).to equal(autoyast_profile) + end + + it "provides collection of services to be disabled" do + service = profile.services.find {|s| s.name == 'nginx'} + expect(service).not_to be_nil + expect(service.status).to eq('disable') + end + + it "provides collection of services to be enabled" do + service = profile.services.find {|s| s.name == 'sshd'} + expect(service).not_to be_nil + expect(service.status).to eq('enable') + end + + it "provides default target" do + expect(profile.target).not_to be_empty + expect(profile.target).to eq('multi-user') + end + end + + context "missing services and target entries in profile" do + before do + @autoyast_profile = {} + @profile = ServicesManagerProfile.new(autoyast_profile) + end + + it "provides not target information" do + expect(profile.target).to be_nil + end + + it "provides empty list of services" do + expect(profile.services).to be_empty + end + end + end +end -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit gstreamer-plugins-good for openSUSE:Factory
by root＠hilbert.suse.de 26 Apr '14

26 Apr '14

Hello community, here is the log from the commit of package gstreamer-plugins-good for openSUSE:Factory checked in at 2014-04-26 11:04:38 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gstreamer-plugins-good (Old) and /work/SRC/openSUSE:Factory/.gstreamer-plugins-good.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "gstreamer-plugins-good" Changes: -------- --- /work/SRC/openSUSE:Factory/gstreamer-plugins-good/gstreamer-plugins-good.changes 2014-02-21 14:25:42.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.gstreamer-plugins-good.new/gstreamer-plugins-good.changes 2014-04-26 11:04:40.000000000 +0200 @@ -1,0 +2,10 @@ +Fri Apr 25 11:40:04 UTC 2014 - dimstar(a)opensuse.org + +- Update to version 1.2.4: + + Bugs fixed: bgo#725104, bgo#722185, bgo#724619, bgo#725124, + bgo#725712, bgo#725860, bgo#726777, bgo#728017, bgo#728041, + bgo#724638, bgo#727329. +- Drop gsp-docs-fix-mismatched-para-tags.patch and + gsp-docs-use-docbook-markup-for-xi:include.patch: fixed upstream. + +------------------------------------------------------------------- Old: ---- gsp-docs-fix-mismatched-para-tags.patch gsp-docs-use-docbook-markup-for-xi:include.patch gst-plugins-good-1.2.3.tar.xz New: ---- gst-plugins-good-1.2.4.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gstreamer-plugins-good.spec ++++++ --- /var/tmp/diff_new_pack.AVF2Ds/_old 2014-04-26 11:04:40.000000000 +0200 +++ /var/tmp/diff_new_pack.AVF2Ds/_new 2014-04-26 11:04:40.000000000 +0200 @@ -22,24 +22,20 @@ Name: gstreamer-plugins-good %define _name gst-plugins-good -Version: 1.2.3 +Version: 1.2.4 Release: 0 %define gst_branch 1.0 Summary: GStreamer Streaming-Media Framework Plug-Ins License: LGPL-2.1+ Group: Productivity/Multimedia/Other Url: http://gstreamer.freedesktop.org/ -Source0: http://gstreamer.freedesktop.org/src/gst-plugins-good/%{_name}-%{version}.t… -# PATCH-FIX-UPSTREAM gsp-docs-fix-mismatched-para-tags.patch bgo#724085 zaitor(a)opensuse.org -- docs: fix mismatched para tags, newer gtkdoc is more sensitive to mismatched docbook tags. -Patch0: gsp-docs-fix-mismatched-para-tags.patch -# PATCH-FIX-UPSTREAM gsp-docs-use-docbook-markup-for-xi:include.patch zaitor(a)opensuse.org -- docs: use docbook markup for xi:include It turns out that the change in gtk-doc-1.20 which wraps the |[]| content in CDATA break xi:inlcude examples. -Patch1: gsp-docs-use-docbook-markup-for-xi:include.patch +Source0: http://download.gnome.org/sources/gst-plugins-good/1.2/%{_name}-%{version}.… %if 0%{?ENABLE_AALIB} BuildRequires: aalib-devel %endif BuildRequires: gcc-c++ BuildRequires: glib2-devel >= 2.31.14 -BuildRequires: gstreamer-devel >= 1.2.0 +BuildRequires: gstreamer-devel >= 1.2.4 BuildRequires: gstreamer-plugins-base-devel >= 1.2.1 BuildRequires: gtk-doc >= 1.12 BuildRequires: libICE-devel @@ -119,8 +115,6 @@ chmod 0644 %{S:0} %setup -q -n %{_name}-%{version} translation-update-upstream po gst-plugins-good-%{gst_branch} -%patch0 -p1 -%patch1 -p1 %build # FIXME: ++++++ gst-plugins-good-1.2.3.tar.xz -> gst-plugins-good-1.2.4.tar.xz ++++++ ++++ 5145 lines of diff (skipped) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit wt for openSUSE:Factory
by root＠hilbert.suse.de 26 Apr '14

26 Apr '14

Hello community, here is the log from the commit of package wt for openSUSE:Factory checked in at 2014-04-26 10:12:08 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/wt (Old) and /work/SRC/openSUSE:Factory/.wt.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "wt" Changes: -------- --- /work/SRC/openSUSE:Factory/wt/wt.changes 2012-02-20 16:19:53.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.wt.new/wt.changes 2014-04-26 10:12:10.000000000 +0200 @@ -1,0 +2,43 @@ +Thu Apr 14 07:17:02 UTC 2014 - dap.darkness(a)gmail.com + +- Added _constraints file to prevent out of memory issue. + +------------------------------------------------------------------- +Thu Apr 3 17:17:02 UTC 2014 - dap.darkness(a)gmail.com + +- Update to 3.3.2: + * WRasterImage: now also support skia as backend. + * Namespace Wt::Signals was created. + * Checkboxes are rendered when CheckStateRole is present. + * Client SSL certificates can be queried from WResources. + * Fixed regression in resource continations. + * Added binary WebGL VBO buffers. + * Layouts: various bug fixes and improvements. + * Render: added support for repeating table headers. + * Render: added support for explicit page breaks and % widths. + * Fix popup widgets confusing preferred size calculations. + * New API for payment with an implementation for PayPal. + * layouts: fix various issues. + * WTextEdit: fix behaviour inside a WPanel. + * Render: code reorganizations for java port. + * QueryModel: added stableResultRow() method. + * Dbo/Exception: add support for SQLSTATE code information. + * Mail/Client: log configuration that will be used on first use. + * WAnchor: use <a> tag even if no link has been provided. + * WDoubleSpinBox: fix formatting. + * WSlider: add more hooks for custom styles. +- Added SourceUrl. +- doxygen, firebird-devel, libharu-devel and pango-devel + became required to build because of cmake warnings. +- Rpm_opt_flags became set via cmake option. +- DWT_CMAKE_FINDER_INSTALL_DIR cmake option became broken + and was replaced by manual file moving. +- DBUILD_EXAMPLES cmake option was enabled + because of FIXME comment at spec-file. +- DENABLE_EXT cmake option was enabled + to satisfy leechcraft requirements. +- Don't package INSTALL file. +- RPM_BUILD_ROOT macro was replaced by buildroot. +- Let make be verbose: V=1. + +------------------------------------------------------------------- Old: ---- wt-3.2.0.tar.bz2 New: ---- _constraints wt-3.3.2.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ wt.spec ++++++ --- /var/tmp/diff_new_pack.OuLLdm/_old 2014-04-26 10:12:11.000000000 +0200 +++ /var/tmp/diff_new_pack.OuLLdm/_new 2014-04-26 10:12:11.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package wt # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,25 +16,40 @@ # - Name: wt -Url: http://www.webtoolkit.eu/wt/ +Version: 3.3.2 +Release: 0 +Summary: Web Toolkit License: GPL-2.0 Group: Development/Libraries/C and C++ -Version: 3.2.0 -Release: 1 -Summary: Web Toolkit -Source0: %{name}-%{version}.tar.bz2 -Requires: FastCGI openssl -BuildRequires: gcc-c++ -BuildRequires: FastCGI-devel openssl-devel +Url: http://www.webtoolkit.eu/wt/ +Source0: https://downloads.sourceforge.net/project/witty/wt/%{version}/wt-%{version}… +BuildRequires: FastCGI-devel +%if 0%{?suse_version} < 1220 +BuildRequires: Mesa-devel +%endif # wt will build with boost-devel < 1.36.0 but it won't work BuildRequires: boost-devel >= 1.36.0 - -BuildRequires: graphviz postgresql-devel -BuildRequires: cmake libqt4-devel pkgconfig +BuildRequires: cmake +BuildRequires: doxygen BuildRequires: fdupes +%if 0%{?suse_version} >= 1220 +BuildRequires: firebird-devel +%endif +BuildRequires: gcc-c++ +BuildRequires: graphviz +%if 0%{?suse_version} >= 1230 +BuildRequires: libharu-devel +%endif +BuildRequires: libqt4-devel +BuildRequires: openssl-devel +BuildRequires: pango-devel +BuildRequires: pkgconfig +BuildRequires: postgresql-devel + +Requires: FastCGI +Requires: openssl BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -49,10 +64,12 @@ %package devel Summary: Web Toolkit - Development Files Group: Development/Libraries/C and C++ -Requires: FastCGI-devel openssl-devel Xerces-c-devel +Requires: %{name} = %{version} +Requires: FastCGI-devel +Requires: Xerces-c-devel Requires: boost-devel >= 1.34.1 Requires: mxml-devel >= 2.3 -Requires: %{name} = %{version} +Requires: openssl-devel %description devel Development files for the Wt library. @@ -93,47 +110,54 @@ %define WTRUNGROUP www mkdir wt-build cd wt-build -CFLAGS=$RPM_OPT_FLAGS CXXFLAGS="$RPM_OPT_FLAGS" \ cmake .. \ + -DCMAKE_C_FLAGS="%{optflags}" \ + -DCMAKE_CXX_FLAGS="%{optflags}" \ -DCMAKE_INSTALL_PREFIX="/usr" \ - -DWT_CMAKE_FINDER_INSTALL_DIR="share/cmake/Modules" \ -DLIB_INSTALL_DIR=%{_lib} \ -DCONNECTOR_HTTP=ON \ -DCONNECTOR_FCGI=ON \ +%if 0%{?suse_version} < 1220 + -DWT_NO_BOOST_RANDOM=ON \ +%endif + -DENABLE_EXT=True \ -DWEBGROUP="%{WTRUNGROUP}" -DWEBUSER="%{WTRUNUSER}" \ -DRUNDIR="%{WTRUNDIR}" \ - -DBUILD_EXAMPLES=OFF -# FIXME: Examples are temporarily disabled to avoid a boost bug that produces -# some errors while compiling the tests. -make %{?_smp_mflags} + -DBUILD_EXAMPLES=ON +make V=1 %{?_smp_mflags} %install cd wt-build -make DESTDIR="$RPM_BUILD_ROOT" install +make V=1 DESTDIR="%{buildroot}" install # hack for broken cmake configs on archs with /lib64 %ifarch ppc64 s390x -mv $RPM_BUILD_ROOT/usr/lib/* $RPM_BUILD_ROOT/usr/%{_lib} || true -rm -Rf $RPM_BUILD_ROOT/usr/lib +mv %{buildroot}/usr/lib/* %{buildroot}/usr/%{_lib} || true +rm -Rf %{buildroot}/usr/lib %endif # end hack -mkdir -p $RPM_BUILD_ROOT/%{_docdir}/%{name} -mkdir -p $RPM_BUILD_ROOT/%{WTSRVDIR} -mkdir -p $RPM_BUILD_ROOT/%{WTRUNDIR} -mkdir $RPM_BUILD_ROOT/%{_docdir}/%{name}-devel/ -cp -rv ../doc/* $RPM_BUILD_ROOT/%{_docdir}/%{name}-devel/ -mv -v $RPM_BUILD_ROOT/%{_datadir}/Wt $RPM_BUILD_ROOT/%{_datadir}/wt +mkdir -p %{buildroot}/%{_docdir}/%{name} +mkdir -p %{buildroot}/%{WTSRVDIR} +mkdir -p %{buildroot}/%{WTRUNDIR} +mkdir %{buildroot}/%{_docdir}/%{name}-devel/ +cp -rv ../doc/* %{buildroot}/%{_docdir}/%{name}-devel/ +mv -v %{buildroot}/%{_datadir}/Wt %{buildroot}/%{_datadir}/wt # We mustn't package .orig files -find $RPM_BUILD_ROOT/%{_includedir}/Wt -name '*.orig' -delete +find %{buildroot}/%{_includedir}/Wt -name '*.orig' -delete # Remove the installdox script used for the installation of documentation. -rm $RPM_BUILD_ROOT/%{_docdir}/%{name}-devel/reference/html/installdox +rm %{buildroot}/%{_docdir}/%{name}-devel/examples/html/installdox # Remove shell scripts used for generating some images. -rm $RPM_BUILD_ROOT/%{_datadir}/wt/resources/themes/*/*/generate.sh +rm %{buildroot}/%{_datadir}/wt/resources/themes/*/*/generate.sh + +# Move cmake module to the correct location. +install -v -m 0755 -d %{buildroot}/%{_datadir}/cmake/Modules +mv -v %{buildroot}/%{_prefix}/cmake/*.cmake \ + %{buildroot}/%{_datadir}/cmake/Modules -%fdupes $RPM_BUILD_ROOT/%{_docdir} -%fdupes $RPM_BUILD_ROOT/%{_datadir} +%fdupes %{buildroot}/%{_docdir} +%fdupes %{buildroot}/%{_datadir} %post -p /sbin/ldconfig @@ -142,11 +166,11 @@ %files %defattr(-,root,root) %{_libdir}/*.so.%{version} -%doc Changelog INSTALL LICENSE +%doc Changelog LICENSE %dir %{WTSRVDIR} -%dir /etc/wt +%dir %{_sysconfdir}/wt %{_datadir}/wt -%config(noreplace) /etc/wt/wt_config.xml +%config(noreplace) %{_sysconfdir}/wt/wt_config.xml %attr(-,%{WTRUNUSER},%{WTRUNGROUP}) %{WTRUNDIR} %files devel -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit ulogd for openSUSE:Factory
by root＠hilbert.suse.de 26 Apr '14

26 Apr '14

Hello community, here is the log from the commit of package ulogd for openSUSE:Factory checked in at 2014-04-26 10:12:01 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ulogd (Old) and /work/SRC/openSUSE:Factory/.ulogd.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ulogd" Changes: -------- --- /work/SRC/openSUSE:Factory/ulogd/ulogd.changes 2013-11-30 16:23:24.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.ulogd.new/ulogd.changes 2014-04-26 10:12:01.000000000 +0200 @@ -1,0 +2,7 @@ +Fri Apr 18 12:37:59 UTC 2014 - jengelh(a)inai.de + +- Update to new upstream release 2.0.4 +* ulogd 2.0.4 features a new JSON output plugin allowing easy + integration with log management systems. + +------------------------------------------------------------------- Old: ---- ulogd-2.0.3.tar.bz2 ulogd-2.0.3.tar.bz2.sig New: ---- ulogd-2.0.4.tar.bz2 ulogd-2.0.4.tar.bz2.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ulogd.spec ++++++ --- /var/tmp/diff_new_pack.gOnGYj/_old 2014-04-26 10:12:02.000000000 +0200 +++ /var/tmp/diff_new_pack.gOnGYj/_new 2014-04-26 10:12:02.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package ulogd # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: ulogd -Version: 2.0.3 +Version: 2.0.4 Release: 0 Summary: Userspace logging for Netfilter License: GPL-2.0 @@ -125,13 +125,13 @@ mkdir -p "$b/var/log/ulogd"; mkdir -p "$b/%_sysconfdir"; install -pm0644 ulogd.conf "$b/%_sysconfdir/"; -mkdir -p "$b/%_initrddir" "$b/%_sbindir"; -install -pm0755 "%{S:3}" "$b/%_initrddir/%name"; -ln -s "%_initrddir/%name" "$b/%_sbindir/rc%name"; - %if 0%{?_unitdir:1} mkdir -p "$b/%_unitdir"; install -pm0644 "%{S:4}" "$b/%_unitdir"; +%else +mkdir -p "$b/%_initrddir" "$b/%_sbindir"; +install -pm0755 "%{S:3}" "$b/%_initrddir/%name"; +ln -s "%_initrddir/%name" "$b/%_sbindir/rc%name"; %endif %pre @@ -141,16 +141,13 @@ %service_add_pre ulogd.service %endif -%post %if 0%{?_unitdir:1} +%post %service_add_post ulogd.service %endif -%preun -%if 0%{?suse_version} -%stop_on_removal ulogd -%endif %if 0%{?_unitdir:1} +%preun %service_del_preun ulogd.service %endif @@ -165,9 +162,7 @@ %files %defattr(-,root,root) %config(noreplace) %_sysconfdir/ulogd.conf -%_initddir/%name %_sbindir/ulogd -%_sbindir/rc%name %dir %_libdir/%name %_libdir/%name/ulogd_[fir]*.so* %_libdir/%name/ulogd_output_GRAPHITE.so* @@ -181,6 +176,9 @@ %attr(0750,ulogd,root) /var/log/ulogd %if 0%{?_unitdir:1} %_unitdir/ulogd.service +%else +%_initddir/%name +%_sbindir/rc%name %endif # These are the dependency-heavy things: ++++++ ulogd-2.0.3.tar.bz2 -> ulogd-2.0.4.tar.bz2 ++++++ ++++ 1862 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ulogd-2.0.3/build-aux/missing new/ulogd-2.0.4/build-aux/missing --- old/ulogd-2.0.3/build-aux/missing 2013-11-19 19:32:15.000000000 +0100 +++ new/ulogd-2.0.4/build-aux/missing 2014-03-23 16:39:32.000000000 +0100 @@ -1,7 +1,7 @@ #! /bin/sh # Common wrapper for a few potentially missing GNU programs. -scriptversion=2012-06-26.16; # UTC +scriptversion=2013-10-28.13; # UTC # Copyright (C) 1996-2013 Free Software Foundation, Inc. # Originally written by Fran,cois Pinard <pinard(a)iro.umontreal.ca>, 1996. @@ -160,7 +160,7 @@ ;; autom4te*) echo "You might have modified some maintainer files that require" - echo "the 'automa4te' program to be rebuilt." + echo "the 'autom4te' program to be rebuilt." program_details 'autom4te' ;; bison*|yacc*) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ulogd-2.0.3/config.h.in new/ulogd-2.0.4/config.h.in --- old/ulogd-2.0.3/config.h.in 2013-11-19 19:32:15.000000000 +0100 +++ new/ulogd-2.0.4/config.h.in 2014-03-23 16:39:31.000000000 +0100 @@ -34,9 +34,6 @@ /* Define to 1 if you have the `pq' library (-lpq). */ #undef HAVE_LIBPQ -/* Define to 1 if you have the `pthread' library (-lpthread). */ -#undef HAVE_LIBPTHREAD - /* Define to 1 if you have the <memory.h> header file. */ #undef HAVE_MEMORY_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ulogd-2.0.3/configure.ac new/ulogd-2.0.4/configure.ac --- old/ulogd-2.0.3/configure.ac 2013-11-18 23:34:03.000000000 +0100 +++ new/ulogd-2.0.4/configure.ac 2014-03-23 16:30:50.000000000 +0100 @@ -1,5 +1,5 @@ dnl Process this file with autoconf to produce a configure script. -AC_INIT([ulogd], [2.0.3]) +AC_INIT([ulogd], [2.0.4]) AC_PREREQ([2.50]) AC_CONFIG_AUX_DIR([build-aux]) AM_INIT_AUTOMAKE([-Wall foreign tar-pax no-dist-gzip dist-bzip2 1.10b]) @@ -39,7 +39,8 @@ regular_CFLAGS="-Wall -Wextra -Wno-unused-parameter" AC_SUBST([regular_CFLAGS]) -AC_CHECK_LIB(pthread, pthread_create) +AC_SEARCH_LIBS([pthread_create], [pthread], [libpthread_LIBS="$LIBS"; LIBS=""]) +AC_SUBST([libpthread_LIBS]) dnl Check for the right nfnetlink version PKG_CHECK_MODULES([LIBNFNETLINK], [libnfnetlink >= 1.0.1]) @@ -116,6 +117,17 @@ enable_pcap="no" fi +AC_ARG_WITH([jansson], AS_HELP_STRING([--without-jansson], [Build without JSON output plugin [default=test]])) +AS_IF([test "x$with_jansson" != "xno"], [ + PKG_CHECK_MODULES([libjansson], [jansson], [], [:]) +]) +AM_CONDITIONAL([HAVE_JANSSON], [test -n "$libjansson_LIBS"]) +if test "x$libjansson_LIBS" != "x"; then + enable_jansson="yes" +else + enable_jansson="no" +fi + dnl AC_SUBST(DATABASE_DIR) dnl AC_SUBST(DATABASE_LIB) dnl AC_SUBST(DATABASE_LIB_DIR) @@ -151,5 +163,6 @@ MySQL plugin: ${enable_mysql} SQLITE3 plugin: ${enable_sqlite3} DBI plugin: ${enable_dbi} + JSON plugin: ${enable_jansson} " echo "You can now run 'make' and 'make install'" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ulogd-2.0.3/filter/raw2packet/ulogd_raw2packet_BASE.c new/ulogd-2.0.4/filter/raw2packet/ulogd_raw2packet_BASE.c --- old/ulogd-2.0.3/filter/raw2packet/ulogd_raw2packet_BASE.c 2013-06-18 22:52:50.000000000 +0200 +++ new/ulogd-2.0.4/filter/raw2packet/ulogd_raw2packet_BASE.c 2014-03-23 16:30:50.000000000 +0100 @@ -259,6 +259,7 @@ .vendor = IPFIX_VENDOR_IETF, .field_id = IPFIX_tcpSourcePort, }, + .cim_name = "src_port", }, [KEY_TCP_DPORT] = { .type = ULOGD_RET_UINT16, @@ -268,6 +269,7 @@ .vendor = IPFIX_VENDOR_IETF, .field_id = IPFIX_tcpDestinationPort, }, + .cim_name = "dest_port", }, [KEY_TCP_SEQ] = { .type = ULOGD_RET_UINT32, @@ -368,6 +370,7 @@ .vendor = IPFIX_VENDOR_IETF, .field_id = IPFIX_udpSourcePort, }, + .cim_name = "src_port", }, [KEY_UDP_DPORT] = { .type = ULOGD_RET_UINT16, @@ -377,6 +380,7 @@ .vendor = IPFIX_VENDOR_IETF, .field_id = IPFIX_udpDestinationPort, }, + .cim_name = "dest_port", }, [KEY_UDP_LEN] = { .type = ULOGD_RET_UINT16, @@ -512,12 +516,14 @@ [KEY_SCTP_SPORT] = { .type = ULOGD_RET_UINT16, .flags = ULOGD_RETF_NONE, - .name = "sctp.sport", + .name = "sctp.sport", + .cim_name = "src_port", }, [KEY_SCTP_DPORT] = { .type = ULOGD_RET_UINT16, .flags = ULOGD_RETF_NONE, - .name = "sctp.dport", + .name = "sctp.dport", + .cim_name = "dest_port", }, [KEY_SCTP_CSUM] = { .type = ULOGD_RET_UINT32, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ulogd-2.0.3/filter/ulogd_filter_IP2STR.c new/ulogd-2.0.4/filter/ulogd_filter_IP2STR.c --- old/ulogd-2.0.3/filter/ulogd_filter_IP2STR.c 2013-06-18 22:52:50.000000000 +0200 +++ new/ulogd-2.0.4/filter/ulogd_filter_IP2STR.c 2014-03-23 16:30:50.000000000 +0100 @@ -102,18 +102,22 @@ { .type = ULOGD_RET_STRING, .name = "ip.saddr.str", + .cim_name = "src_ip", }, { .type = ULOGD_RET_STRING, .name = "ip.daddr.str", + .cim_name = "dest_ip", }, { .type = ULOGD_RET_STRING, .name = "orig.ip.saddr.str", + .cim_name = "src_ip", }, { .type = ULOGD_RET_STRING, .name = "orig.ip.daddr.str", + .cim_name = "dest_ip", }, { .type = ULOGD_RET_STRING, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ulogd-2.0.3/include/ulogd/db.h new/ulogd-2.0.4/include/ulogd/db.h --- old/ulogd-2.0.3/include/ulogd/db.h 2013-06-18 22:52:50.000000000 +0200 +++ new/ulogd-2.0.4/include/ulogd/db.h 2014-03-23 16:30:50.000000000 +0100 @@ -65,7 +65,7 @@ #define TIME_ERR ((time_t)-1) /* Be paranoid */ #define RECONNECT_DEFAULT 2 #define MAX_ONESHOT_REQUEST 10 -#define RING_BUFFER_DEFAULT_SIZE 10 +#define RING_BUFFER_DEFAULT_SIZE 0 #define DB_CES \ { \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ulogd-2.0.3/include/ulogd/printpkt.h new/ulogd-2.0.4/include/ulogd/printpkt.h --- old/ulogd-2.0.3/include/ulogd/printpkt.h 2013-06-18 22:52:50.000000000 +0200 +++ new/ulogd-2.0.4/include/ulogd/printpkt.h 2014-03-23 16:30:50.000000000 +0100 @@ -3,7 +3,6 @@ enum pkt_keys { KEY_OOB_FAMILY, - KEY_OOB_TIME_SEC, KEY_OOB_PREFIX, KEY_OOB_IN, KEY_OOB_OUT, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ulogd-2.0.3/include/ulogd/ulogd.h new/ulogd-2.0.4/include/ulogd/ulogd.h --- old/ulogd-2.0.3/include/ulogd/ulogd.h 2013-06-18 22:52:50.000000000 +0200 +++ new/ulogd-2.0.4/include/ulogd/ulogd.h 2014-03-23 16:30:50.000000000 +0100 @@ -17,6 +17,7 @@ #include <stdio.h> #include <signal.h> /* need this because of extension-sighandler */ #include <sys/types.h> +#include <inttypes.h> #include <string.h> #include <config.h> @@ -97,6 +98,9 @@ u_int16_t field_id; } ipfix; + /* Store field name for Common Information Model */ + char *cim_name; + union { /* and finally the returned value */ union { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ulogd-2.0.3/input/flow/ulogd_inpflow_NFCT.c new/ulogd-2.0.4/input/flow/ulogd_inpflow_NFCT.c --- old/ulogd-2.0.3/input/flow/ulogd_inpflow_NFCT.c 2013-11-18 23:34:03.000000000 +0100 +++ new/ulogd-2.0.4/input/flow/ulogd_inpflow_NFCT.c 2014-03-23 16:30:50.000000000 +0100 @@ -621,7 +621,7 @@ propagate_ct(upi, upi, ct, type, ts); } -static void set_timestamp_from_ct(struct ct_timestamp *ts, +static int set_timestamp_from_ct_try(struct ct_timestamp *ts, struct nf_conntrack *ct, int name) { int attr_name; @@ -636,7 +636,15 @@ nfct_get_attr_u64(ct, attr_name) / NSEC_PER_SEC; ts->time[name].tv_usec = (nfct_get_attr_u64(ct, attr_name) % NSEC_PER_SEC) / 1000; - } else + return 1; + } + return 0; +} + +static void set_timestamp_from_ct(struct ct_timestamp *ts, + struct nf_conntrack *ct, int name) +{ + if (!set_timestamp_from_ct_try(ts, ct, name)) gettimeofday(&ts->time[name], NULL); } @@ -732,8 +740,10 @@ break; case NFCT_T_DESTROY: set_timestamp_from_ct(&tmp, ct, STOP); - tmp.time[START].tv_sec = 0; - tmp.time[START].tv_usec = 0; + if (!set_timestamp_from_ct_try(&tmp, ct, START)) { + tmp.time[START].tv_sec = 0; + tmp.time[START].tv_usec = 0; + } break; default: ulogd_log(ULOGD_NOTICE, "unsupported message type\n"); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ulogd-2.0.3/m4/libtool.m4 new/ulogd-2.0.4/m4/libtool.m4 --- old/ulogd-2.0.3/m4/libtool.m4 2013-11-19 19:32:12.000000000 +0100 +++ new/ulogd-2.0.4/m4/libtool.m4 2014-03-23 16:39:29.000000000 +0100 @@ -1312,7 +1312,7 @@ rm -rf conftest* ;; -x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \ +x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) # Find out which ABI we are using. echo 'int i;' > conftest.$ac_ext @@ -1333,7 +1333,10 @@ ;; esac ;; - ppc64-*linux*|powerpc64-*linux*) + powerpc64le-*) + LD="${LD-ld} -m elf32lppclinux" + ;; + powerpc64-*) LD="${LD-ld} -m elf32ppclinux" ;; s390x-*linux*) @@ -1352,7 +1355,10 @@ x86_64-*linux*) LD="${LD-ld} -m elf_x86_64" ;; - ppc*-*linux*|powerpc*-*linux*) + powerpcle-*) + LD="${LD-ld} -m elf64lppc" + ;; + powerpc-*) LD="${LD-ld} -m elf64ppc" ;; s390*-*linux*|s390*-*tpf*) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ulogd-2.0.3/output/Makefile.am new/ulogd-2.0.4/output/Makefile.am --- old/ulogd-2.0.3/output/Makefile.am 2013-06-18 22:52:50.000000000 +0200 +++ new/ulogd-2.0.4/output/Makefile.am 2014-03-23 16:30:50.000000000 +0100 @@ -9,6 +9,10 @@ ulogd_output_NACCT.la ulogd_output_XML.la \ ulogd_output_GRAPHITE.la +if HAVE_JANSSON +pkglib_LTLIBRARIES += ulogd_output_JSON.la +endif + ulogd_output_GPRINT_la_SOURCES = ulogd_output_GPRINT.c ulogd_output_GPRINT_la_LDFLAGS = -avoid-version -module @@ -32,3 +36,9 @@ ulogd_output_GRAPHITE_la_SOURCES = ulogd_output_GRAPHITE.c ulogd_output_GRAPHITE_la_LDFLAGS = -avoid-version -module + +if HAVE_JANSSON +ulogd_output_JSON_la_SOURCES = ulogd_output_JSON.c +ulogd_output_JSON_la_LIBADD = ${libjansson_LIBS} +ulogd_output_JSON_la_LDFLAGS = -avoid-version -module +endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ulogd-2.0.3/output/ulogd_output_JSON.c new/ulogd-2.0.4/output/ulogd_output_JSON.c --- old/ulogd-2.0.3/output/ulogd_output_JSON.c 1970-01-01 01:00:00.000000000 +0100 +++ new/ulogd-2.0.4/output/ulogd_output_JSON.c 2014-03-23 16:30:50.000000000 +0100 @@ -0,0 +1,292 @@ +/* ulogd_output_JSON.c + * + * ulogd output target for logging to a file in JSON format. + * + * (C) 2014 by Eric Leblond <eric(a)regit.org> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 + * as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#include <stdio.h> +#include <stdlib.h> +#include <string.h> +#include <time.h> +#include <errno.h> +#include <inttypes.h> +#include <ulogd/ulogd.h> +#include <ulogd/conffile.h> +#include <jansson.h> + +#ifndef ULOGD_JSON_DEFAULT +#define ULOGD_JSON_DEFAULT "/var/log/ulogd.json" +#endif + +#ifndef ULOGD_JSON_DEFAULT_DEVICE +#define ULOGD_JSON_DEFAULT_DEVICE "Netfilter" +#endif + +struct json_priv { + FILE *of; + int sec_idx; + int usec_idx; +}; + +enum json_conf { + JSON_CONF_FILENAME = 0, + JSON_CONF_SYNC, + JSON_CONF_TIMESTAMP, + JSON_CONF_DEVICE, + JSON_CONF_BOOLEAN_LABEL, + JSON_CONF_MAX +}; + +static struct config_keyset json_kset = { + .num_ces = JSON_CONF_MAX, + .ces = { + [JSON_CONF_FILENAME] = { + .key = "file", + .type = CONFIG_TYPE_STRING, + .options = CONFIG_OPT_NONE, + .u = {.string = ULOGD_JSON_DEFAULT }, + }, + [JSON_CONF_SYNC] = { + .key = "sync", + .type = CONFIG_TYPE_INT, + .options = CONFIG_OPT_NONE, + .u = { .value = 0 }, + }, + [JSON_CONF_TIMESTAMP] = { + .key = "timestamp", + .type = CONFIG_TYPE_INT, + .options = CONFIG_OPT_NONE, + .u = { .value = 1 }, + }, + [JSON_CONF_DEVICE] = { + .key = "device", + .type = CONFIG_TYPE_STRING, + .options = CONFIG_OPT_NONE, + .u = { .string = ULOGD_JSON_DEFAULT_DEVICE }, + }, + [JSON_CONF_BOOLEAN_LABEL] = { + .key = "boolean_label", + .type = CONFIG_TYPE_INT, + .options = CONFIG_OPT_NONE, + .u = { .value = 0 }, + }, + }, +}; + +#define MAX_LOCAL_TIME_STRING 32 + +static int json_interp(struct ulogd_pluginstance *upi) +{ + struct json_priv *opi = (struct json_priv *) &upi->private; + unsigned int i; + json_t *msg; + + msg = json_object(); + if (!msg) { + ulogd_log(ULOGD_ERROR, "Unable to create JSON object\n"); + return ULOGD_IRET_ERR; + } + + if (upi->config_kset->ces[JSON_CONF_TIMESTAMP].u.value != 0) { + time_t now; + char timestr[MAX_LOCAL_TIME_STRING]; + struct tm *t; + struct tm result; + struct ulogd_key *inp = upi->input.keys; + + + if (pp_is_valid(inp, opi->sec_idx)) + now = (time_t) ikey_get_u64(&inp[opi->sec_idx]); + else + now = time(NULL); + t = localtime_r(&now, &result); + + if (pp_is_valid(inp, opi->usec_idx)) { + snprintf(timestr, MAX_LOCAL_TIME_STRING, + "%04d-%02d-%02dT%02d:%02d:%02d.%06u", + t->tm_year + 1900, t->tm_mon + 1, + t->tm_mday, t->tm_hour, + t->tm_min, t->tm_sec, + ikey_get_u32(&inp[opi->usec_idx])); + } else { + snprintf(timestr, MAX_LOCAL_TIME_STRING, + "%04d-%02d-%02dT%02d:%02d:%02d", + t->tm_year + 1900, t->tm_mon + 1, + t->tm_mday, t->tm_hour, + t->tm_min, t->tm_sec); + } + + json_object_set_new(msg, "timestamp", json_string(timestr)); + } + + if (upi->config_kset->ces[JSON_CONF_DEVICE].u.string) { + char *dvc = upi->config_kset->ces[JSON_CONF_DEVICE].u.string; + json_object_set_new(msg, "dvc", json_string(dvc)); + } + + + + for (i = 0; i < upi->input.num_keys; i++) { + struct ulogd_key *key = upi->input.keys[i].u.source; + char *field_name; + + if (!key) + continue; + + if (!IS_VALID(*key)) + continue; + + field_name = key->cim_name ? key->cim_name : key->name; + + switch (key->type) { + case ULOGD_RET_STRING: + json_object_set_new(msg, field_name, json_string(key->u.value.ptr)); + break; + case ULOGD_RET_BOOL: + case ULOGD_RET_INT8: + case ULOGD_RET_INT16: + case ULOGD_RET_INT32: + json_object_set_new(msg, field_name, json_integer(key->u.value.i32)); + break; + case ULOGD_RET_UINT8: + if ((upi->config_kset->ces[JSON_CONF_BOOLEAN_LABEL].u.value != 0) + && (!strcmp(key->name, "raw.label"))) { + if (key->u.value.ui8) + json_object_set_new(msg, "action", json_string("allowed")); + else + json_object_set_new(msg, "action", json_string("blocked")); + break; + } + case ULOGD_RET_UINT16: + case ULOGD_RET_UINT32: + case ULOGD_RET_UINT64: + json_object_set_new(msg, field_name, json_integer(key->u.value.ui64)); + default: + /* don't know how to interpret this key. */ + break; + } + } + + json_dumpf(msg, opi->of, 0); + fprintf(opi->of, "\n"); + + json_decref(msg); + + if (upi->config_kset->ces[JSON_CONF_SYNC].u.value != 0) + fflush(opi->of); + + return ULOGD_IRET_OK; +} + +static void sighup_handler_print(struct ulogd_pluginstance *upi, int signal) +{ + struct json_priv *oi = (struct json_priv *) &upi->private; + FILE *old = oi->of; + + switch (signal) { + case SIGHUP: + ulogd_log(ULOGD_NOTICE, "JSON: reopening logfile\n"); + oi->of = fopen(upi->config_kset->ces[0].u.string, "a"); + if (!oi->of) { + ulogd_log(ULOGD_ERROR, "can't open JSON " + "log file: %s\n", + strerror(errno)); + oi->of = old; + } else { + fclose(old); + } + break; + default: + break; + } +} + +static int json_configure(struct ulogd_pluginstance *upi, + struct ulogd_pluginstance_stack *stack) +{ + int ret; + + ret = ulogd_wildcard_inputkeys(upi); + if (ret < 0) + return ret; + + ret = config_parse_file(upi->id, upi->config_kset); + if (ret < 0) + return ret; + + return 0; +} + +static int json_init(struct ulogd_pluginstance *upi) +{ + struct json_priv *op = (struct json_priv *) &upi->private; + unsigned int i; + + op->of = fopen(upi->config_kset->ces[0].u.string, "a"); + if (!op->of) { + ulogd_log(ULOGD_FATAL, "can't open JSON log file: %s\n", + strerror(errno)); + return -1; + } + + /* search for time */ + op->sec_idx = -1; + op->usec_idx = -1; + for (i = 0; i < upi->input.num_keys; i++) { + struct ulogd_key *key = upi->input.keys[i].u.source; + if (!strcmp(key->name, "oob.time.sec")) + op->sec_idx = i; + else if (!strcmp(key->name, "oob.time.usec")) + op->usec_idx = i; + } + + return 0; +} + +static int json_fini(struct ulogd_pluginstance *pi) +{ + struct json_priv *op = (struct json_priv *) &pi->private; + + if (op->of != stdout) + fclose(op->of); + + return 0; +} + +static struct ulogd_plugin json_plugin = { + .name = "JSON", + .input = { + .type = ULOGD_DTYPE_PACKET | ULOGD_DTYPE_FLOW | ULOGD_DTYPE_SUM, + }, + .output = { + .type = ULOGD_DTYPE_SINK, + }, + .configure = &json_configure, + .interp = &json_interp, + .start = &json_init, + .stop = &json_fini, + .signal = &sighup_handler_print, + .config_kset = &json_kset, + .version = VERSION, +}; + +void __attribute__ ((constructor)) init(void); + +void init(void) +{ + ulogd_register_plugin(&json_plugin); +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ulogd-2.0.3/output/ulogd_output_NACCT.c new/ulogd-2.0.4/output/ulogd_output_NACCT.c --- old/ulogd-2.0.3/output/ulogd_output_NACCT.c 2013-11-18 23:34:03.000000000 +0100 +++ new/ulogd-2.0.4/output/ulogd_output_NACCT.c 2014-03-23 16:30:50.000000000 +0100 @@ -127,7 +127,7 @@ 'timestamp' value use 'flow.end.sec' */ if (ikey_get_u8(&inp[KEY_IP_PROTO]) == IPPROTO_ICMP) { snprintf(buf, sizeof(buf), - "%u\t%u\t%s\t%u\t%s\t%u\t%llu\t%llu", + "%u\t%u\t%s\t%u\t%s\t%u\t%" PRIu64 "\t%" PRIu64, ikey_get_u32(&inp[KEY_FLOW_END]), ikey_get_u8(&inp[KEY_IP_PROTO]), (char *) ikey_get_ptr(&inp[KEY_IP_SADDR]), @@ -138,7 +138,7 @@ ikey_get_u64(&inp[KEY_RAW_PKTLEN])); } else { snprintf(buf, sizeof(buf), - "%u\t%u\t%s\t%u\t%s\t%u\t%llu\t%llu", + "%u\t%u\t%s\t%u\t%s\t%u\t%" PRIu64 "\t%" PRIu64, ikey_get_u32(&inp[KEY_FLOW_END]), ikey_get_u8(&inp[KEY_IP_PROTO]), (char *) ikey_get_ptr(&inp[KEY_IP_SADDR]), diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ulogd-2.0.3/src/Makefile.am new/ulogd-2.0.4/src/Makefile.am --- old/ulogd-2.0.3/src/Makefile.am 2013-06-18 22:52:50.000000000 +0200 +++ new/ulogd-2.0.4/src/Makefile.am 2014-03-23 16:30:50.000000000 +0100 @@ -7,5 +7,5 @@ sbin_PROGRAMS = ulogd ulogd_SOURCES = ulogd.c select.c timer.c rbtree.c conffile.c hash.c addr.c -ulogd_LDADD = ${libdl_LIBS} -ulogd_LDFLAGS = -export-dynamic -lpthread +ulogd_LDADD = ${libdl_LIBS} ${libpthread_LIBS} +ulogd_LDFLAGS = -export-dynamic diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ulogd-2.0.3/src/conffile.c new/ulogd-2.0.4/src/conffile.c --- old/ulogd-2.0.3/src/conffile.c 2013-06-18 22:52:50.000000000 +0200 +++ new/ulogd-2.0.4/src/conffile.c 2014-03-23 16:30:50.000000000 +0100 @@ -146,7 +146,7 @@ return -ERRTOOLONG; } - if (!(wordend = get_word(line, " \t\n[]", (char *) wordbuf))) + if (!(wordend = get_word(line, " \t\n\r[]", (char *) wordbuf))) continue; pr_debug("word: \"%s\"\n", wordbuf); if (!strcmp(wordbuf, section)) { @@ -178,7 +178,7 @@ return -ERRTOOLONG; } - if (!(wordend = get_word(line, " =\t\n", (char *) &wordbuf))) + if (!(wordend = get_word(line, " =\t\n\r", (char *) &wordbuf))) continue; if (wordbuf[0] == '[' ) { @@ -195,7 +195,7 @@ continue; } - wordend = get_word(wordend, " =\t\n", (char *) &wordbuf); + wordend = get_word(wordend, " =\t\n\r", (char *) &wordbuf); args = (char *)&wordbuf; if (ce->hit && !(ce->options & CONFIG_OPT_MULTI)) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ulogd-2.0.3/src/ulogd.c new/ulogd-2.0.4/src/ulogd.c --- old/ulogd-2.0.3/src/ulogd.c 2013-11-18 23:34:03.000000000 +0100 +++ new/ulogd-2.0.4/src/ulogd.c 2014-03-23 16:30:50.000000000 +0100 @@ -442,7 +442,7 @@ timestr = ctime(&tm); timestr[strlen(timestr)-1] = '\0'; fprintf(outfd, "%s <%1.1d> %s:%d ", timestr, level, file, line); - if (verbose) + if (verbose && outfd != stderr) fprintf(stderr, "%s <%1.1d> %s:%d ", timestr, level, file, line); @@ -452,7 +452,7 @@ /* flush glibc's buffer */ fflush(outfd); - if (verbose) { + if (verbose && outfd != stderr) { va_start(ap, format); vfprintf(stderr, format, ap); va_end(ap); @@ -1383,9 +1383,10 @@ } /* command line has precedence on config file */ - if (loglevel) + if (loglevel) { loglevel_ce.u.value = loglevel; loglevel_ce.flag |= CONFIG_FLAG_VAL_PROTECTED; + } if (ulogd_pidfile) { if (create_pidfile() < 0) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ulogd-2.0.3/ulogd.conf.in new/ulogd-2.0.4/ulogd.conf.in --- old/ulogd-2.0.3/ulogd.conf.in 2013-11-18 23:34:03.000000000 +0100 +++ new/ulogd-2.0.4/ulogd.conf.in 2014-03-23 16:30:50.000000000 +0100 @@ -49,6 +49,7 @@ plugin="@pkglibdir@/ulogd_raw2packet_BASE.so" plugin="@pkglibdir@/ulogd_inpflow_NFACCT.so" plugin="@pkglibdir@/ulogd_output_GRAPHITE.so" +#plugin="@pkglibdir@/ulogd_output_JSON.so" # this is a stack for logging packet send by system via LOGEMU #stack=log1:NFLOG,base1:BASE,ifi1:IFINDEX,ip2str1:IP2STR,print1:PRINTPKT,emu1:LOGEMU @@ -92,6 +93,9 @@ # this is a stack for logging packet to PGsql after a collect via NFLOG #stack=log2:NFLOG,base1:BASE,ifi1:IFINDEX,ip2str1:IP2STR,mac2str1:HWHDR,pgsql1:PGSQL +# this is a stack for logging packet to JSON formatted file after a collect via NFLOG +#stack=log2:NFLOG,base1:BASE,ifi1:IFINDEX,ip2str1:IP2STR,mac2str1:HWHDR,json1:JSON + # this is a stack for logging packets to syslog after a collect via NFLOG #stack=log3:NFLOG,base1:BASE,ifi1:IFINDEX,ip2str1:IP2STR,print1:PRINTPKT,sys1:SYSLOG @@ -195,6 +199,17 @@ directory="/var/log/" sync=1 +[json1] +sync=1 +#file="/var/log/ulogd.json" +#timestamp=0 +# device name to be used in JSON message +#device="My awesome Netfilter firewall" +# If boolean_label is set to 1 then the numeric_label put on packet +# by the input plugin is coding the action on packet: if 0, then +# packet has been blocked and if non null it has been accepted. +#boolean_label=1 + [pcap1] #default file is /var/log/ulogd.pcap #file="/var/log/ulogd.pcap" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ulogd-2.0.3/util/db.c new/ulogd-2.0.4/util/db.c --- old/ulogd-2.0.3/util/db.c 2013-06-18 22:52:50.000000000 +0200 +++ new/ulogd-2.0.4/util/db.c 2014-03-23 16:30:50.000000000 +0100 @@ -590,7 +590,8 @@ "permanently disabling plugin\n"); di->interp = &disabled_interp_db; return NULL; - } + } else /* try to re run query */ + continue; } *wr_place = RING_NO_QUERY; di->ring.rd_item++; @@ -619,6 +620,23 @@ ulogd_log(ULOGD_ERROR, "No SIGHUP handling if ring buffer is used\n"); break; + case SIGTERM: + case SIGINT: + if (di->ring.size) { + int s = pthread_cancel(di->db_thread_id); + if (s != 0) { + ulogd_log(ULOGD_ERROR, + "Can't cancel injection thread\n"); + break; + } + s = pthread_join(di->db_thread_id, NULL); + if (s != 0) { + ulogd_log(ULOGD_ERROR, + "Error waiting for injection thread" + "cancelation\n"); + } + } + break; default: break; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ulogd-2.0.3/util/printflow.c new/ulogd-2.0.4/util/printflow.c --- old/ulogd-2.0.3/util/printflow.c 2013-11-18 23:34:03.000000000 +0100 +++ new/ulogd-2.0.4/util/printflow.c 2014-03-23 16:30:50.000000000 +0100 @@ -135,9 +135,10 @@ }; int printflow_keys_num = sizeof(printflow_keys)/sizeof(*printflow_keys); -#define pp_print(buf_cur, label, res, x, type) \ +#define pp_pri(type) PRI##type +#define pp_print_u(buf_cur, label, res, x, type) \ if (pp_is_valid(res, x)) \ - buf_cur += sprintf(buf_cur, label"=%u ", ikey_get_##type(&res[x])); + buf_cur += sprintf(buf_cur, label"=%" pp_pri(type) " ", ikey_get_##type(&res[x])); int printflow_print(struct ulogd_key *res, char *buf) { @@ -175,20 +176,20 @@ switch (ikey_get_u8(&res[PRINTFLOW_ORIG_IP_PROTOCOL])) { case IPPROTO_TCP: buf_cur += sprintf(buf_cur, "PROTO=TCP "); - pp_print(buf_cur, "SPT", res, PRINTFLOW_ORIG_L4_SPORT, u16); - pp_print(buf_cur, "DPT", res, PRINTFLOW_ORIG_L4_DPORT, u16); + pp_print_u(buf_cur, "SPT", res, PRINTFLOW_ORIG_L4_SPORT, u16); + pp_print_u(buf_cur, "DPT", res, PRINTFLOW_ORIG_L4_DPORT, u16); break; case IPPROTO_UDP: buf_cur += sprintf(buf_cur, "PROTO=UDP "); - pp_print(buf_cur, "SPT", res, PRINTFLOW_ORIG_L4_SPORT, u16); - pp_print(buf_cur, "DPT", res, PRINTFLOW_ORIG_L4_DPORT, u16); + pp_print_u(buf_cur, "SPT", res, PRINTFLOW_ORIG_L4_SPORT, u16); + pp_print_u(buf_cur, "DPT", res, PRINTFLOW_ORIG_L4_DPORT, u16); break; case IPPROTO_ICMP: buf_cur += sprintf(buf_cur, "PROTO=ICMP "); - pp_print(buf_cur, "TYPE", res, PRINTFLOW_ICMP_CODE, u8); - pp_print(buf_cur, "CODE", res, PRINTFLOW_ICMP_TYPE, u8); + pp_print_u(buf_cur, "TYPE", res, PRINTFLOW_ICMP_CODE, u8); + pp_print_u(buf_cur, "CODE", res, PRINTFLOW_ICMP_TYPE, u8); break; case IPPROTO_ESP: @@ -200,13 +201,13 @@ break; default: - pp_print(buf_cur, "PROTO", res, PRINTFLOW_ORIG_IP_PROTOCOL, u8); + pp_print_u(buf_cur, "PROTO", res, PRINTFLOW_ORIG_IP_PROTOCOL, u8); break; } orig_out: - pp_print(buf_cur, "PKTS", res, PRINTFLOW_ORIG_RAW_PKTCOUNT, u64); - pp_print(buf_cur, "BYTES", res, PRINTFLOW_ORIG_RAW_PKTLEN, u64); + pp_print_u(buf_cur, "PKTS", res, PRINTFLOW_ORIG_RAW_PKTCOUNT, u64); + pp_print_u(buf_cur, "BYTES", res, PRINTFLOW_ORIG_RAW_PKTLEN, u64); buf_cur += sprintf(buf_cur, ", REPLY: "); @@ -226,20 +227,20 @@ switch (ikey_get_u8(&res[PRINTFLOW_REPLY_IP_PROTOCOL])) { case IPPROTO_TCP: buf_cur += sprintf(buf_cur, "PROTO=TCP "); - pp_print(buf_cur, "SPT", res, PRINTFLOW_REPLY_L4_SPORT, u16); - pp_print(buf_cur, "DPT", res, PRINTFLOW_REPLY_L4_DPORT, u16); + pp_print_u(buf_cur, "SPT", res, PRINTFLOW_REPLY_L4_SPORT, u16); + pp_print_u(buf_cur, "DPT", res, PRINTFLOW_REPLY_L4_DPORT, u16); break; case IPPROTO_UDP: buf_cur += sprintf(buf_cur, "PROTO=UDP "); - pp_print(buf_cur, "SPT", res, PRINTFLOW_REPLY_L4_SPORT, u16); - pp_print(buf_cur, "DPT", res, PRINTFLOW_REPLY_L4_DPORT, u16); + pp_print_u(buf_cur, "SPT", res, PRINTFLOW_REPLY_L4_SPORT, u16); + pp_print_u(buf_cur, "DPT", res, PRINTFLOW_REPLY_L4_DPORT, u16); break; case IPPROTO_ICMP: buf_cur += sprintf(buf_cur, "PROTO=ICMP "); - pp_print(buf_cur, "TYPE", res, PRINTFLOW_ICMP_CODE, u8); - pp_print(buf_cur, "CODE", res, PRINTFLOW_ICMP_TYPE, u8); + pp_print_u(buf_cur, "TYPE", res, PRINTFLOW_ICMP_CODE, u8); + pp_print_u(buf_cur, "CODE", res, PRINTFLOW_ICMP_TYPE, u8); break; case IPPROTO_ESP: @@ -251,13 +252,13 @@ break; default: - pp_print(buf_cur, "PROTO", res, PRINTFLOW_REPLY_IP_PROTOCOL, u8); + pp_print_u(buf_cur, "PROTO", res, PRINTFLOW_REPLY_IP_PROTOCOL, u8); break; } reply_out: - pp_print(buf_cur, "PKTS", res, PRINTFLOW_REPLY_RAW_PKTCOUNT, u64); - pp_print(buf_cur, "BYTES", res, PRINTFLOW_REPLY_RAW_PKTLEN, u64); + pp_print_u(buf_cur, "PKTS", res, PRINTFLOW_REPLY_RAW_PKTCOUNT, u64); + pp_print_u(buf_cur, "BYTES", res, PRINTFLOW_REPLY_RAW_PKTLEN, u64); strcat(buf_cur, "\n"); return 0; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ulogd-2.0.3/util/printpkt.c new/ulogd-2.0.4/util/printpkt.c --- old/ulogd-2.0.3/util/printpkt.c 2013-06-18 22:52:50.000000000 +0200 +++ new/ulogd-2.0.4/util/printpkt.c 2014-03-23 16:30:50.000000000 +0100 @@ -39,7 +39,6 @@ struct ulogd_key printpkt_keys[] = { [KEY_OOB_FAMILY] = { .name = "oob.family", }, [KEY_OOB_PROTOCOL] = { .name = "oob.protocol", }, - [KEY_OOB_TIME_SEC] = { .name = "oob.time.sec", }, [KEY_OOB_PREFIX] = { .name = "oob.prefix", }, [KEY_OOB_IN] = { .name = "oob.in", }, [KEY_OOB_OUT] = { .name = "oob.out", }, ++++++ ulogd-conf.diff ++++++ --- /var/tmp/diff_new_pack.gOnGYj/_old 2014-04-26 10:12:02.000000000 +0200 +++ /var/tmp/diff_new_pack.gOnGYj/_new 2014-04-26 10:12:02.000000000 +0200 @@ -1,11 +1,11 @@ --- - ulogd.conf.in | 27 ++++++++++----------------- - 1 file changed, 10 insertions(+), 17 deletions(-) + ulogd.conf.in | 29 +++++++++++------------------ + 1 file changed, 11 insertions(+), 18 deletions(-) -Index: ulogd-2.0.3/ulogd.conf.in +Index: ulogd-2.0.4/ulogd.conf.in =================================================================== ---- ulogd-2.0.3.orig/ulogd.conf.in -+++ ulogd-2.0.3/ulogd.conf.in +--- ulogd-2.0.4.orig/ulogd.conf.in ++++ ulogd-2.0.4/ulogd.conf.in @@ -6,9 +6,10 @@ # GLOBAL OPTIONS ###################################################################### @@ -18,7 +18,7 @@ # loglevel: debug(1), info(3), notice(5), error(7) or fatal(8) (default 5) # loglevel=1 -@@ -56,9 +57,6 @@ plugin="@pkglibdir@/ulogd_output_GRAPHIT +@@ -57,9 +58,6 @@ plugin="@pkglibdir@/ulogd_output_GRAPHIT # this is a stack for packet-based logging via LOGEMU #stack=log2:NFLOG,base1:BASE,ifi1:IFINDEX,ip2str1:IP2STR,print1:PRINTPKT,emu1:LOGEMU @@ -28,7 +28,7 @@ # this is a stack for packet-based logging via LOGEMU with filtering on MARK #stack=log2:NFLOG,mark1:MARK,base1:BASE,ifi1:IFINDEX,ip2str1:IP2STR,print1:PRINTPKT,emu1:LOGEMU -@@ -170,34 +168,29 @@ numeric_label=1 # you can label the log +@@ -174,34 +172,29 @@ numeric_label=1 # you can label the log #netlink_socket_buffer_maxsize=1085440 #bind=1 @@ -61,6 +61,15 @@ +directory="/var/log/ulogd/" sync=1 + [json1] + sync=1 +-#file="/var/log/ulogd.json" ++#file="/var/log/ulogd/ulogd.json" + #timestamp=0 + # device name to be used in JSON message + #device="My awesome Netfilter firewall" +@@ -212,7 +205,7 @@ sync=1 + [pcap1] #default file is /var/log/ulogd.pcap -#file="/var/log/ulogd.pcap" @@ -68,7 +77,7 @@ sync=1 [mysql1] -@@ -282,12 +275,12 @@ procedure="INSERT_PACKET_FULL" +@@ -297,12 +290,12 @@ procedure="INSERT_PACKET_FULL" [sqlite3_ct] table="ulog_ct" @@ -83,7 +92,7 @@ buffer=200 [sys2] -@@ -295,7 +288,7 @@ facility=LOG_LOCAL2 +@@ -310,7 +303,7 @@ facility=LOG_LOCAL2 [nacct1] sync = 1 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit smuxi for openSUSE:Factory
by root＠hilbert.suse.de 26 Apr '14

26 Apr '14

Hello community, here is the log from the commit of package smuxi for openSUSE:Factory checked in at 2014-04-26 10:11:52 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/smuxi (Old) and /work/SRC/openSUSE:Factory/.smuxi.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "smuxi" Changes: -------- --- /work/SRC/openSUSE:Factory/smuxi/smuxi.changes 2013-12-24 16:04:58.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.smuxi.new/smuxi.changes 2014-04-26 10:11:53.000000000 +0200 @@ -1,0 +2,14 @@ +Wed Apr 23 18:29:49 UTC 2014 - develop7(a)develop7.info + +- Updated to version 0.11: + + User Interface Enhancements: + - The chat list can be shrunken. + - The highlight counter is now a separate column. + + Multi Identity Support. + + Message Patterns. + + Hooks Enhancements. + + Twitter Enhancements. + + JabbR (Beta) Enhancements. + + Updated translations. + +------------------------------------------------------------------- Old: ---- smuxi-0.10.tar.gz New: ---- smuxi-0.11.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ smuxi.spec ++++++ --- /var/tmp/diff_new_pack.nU6Nuk/_old 2014-04-26 10:11:54.000000000 +0200 +++ /var/tmp/diff_new_pack.nU6Nuk/_new 2014-04-26 10:11:54.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package smuxi # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: smuxi -Version: 0.10 +Version: 0.11 Release: 0 # FIXME: when db4o is in Factory, uncomment BuildRequires for it Url: http://www.smuxi.org @@ -27,7 +27,7 @@ Group: Productivity/Networking/IRC #BuildRequires: indicate-sharp BuildRequires: intltool -BuildRequires: mono-devel >= 1.9 +BuildRequires: mono-devel >= 2.6 BuildRequires: update-desktop-files BuildRequires: mono(System.Web.Extensions) #BuildRequires: pkgconfig(db4o) >= 8.0 ++++++ smuxi-0.10.tar.gz -> smuxi-0.11.tar.gz ++++++ ++++ 8229 lines of diff (skipped) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit scim-bridge for openSUSE:Factory
by root＠hilbert.suse.de 26 Apr '14

26 Apr '14

Hello community, here is the log from the commit of package scim-bridge for openSUSE:Factory checked in at 2014-04-26 10:11:46 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/scim-bridge (Old) and /work/SRC/openSUSE:Factory/.scim-bridge.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "scim-bridge" Changes: -------- --- /work/SRC/openSUSE:Factory/scim-bridge/scim-bridge.changes 2012-09-14 12:37:34.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.scim-bridge.new/scim-bridge.changes 2014-04-26 10:11:48.000000000 +0200 @@ -1,0 +2,5 @@ +Thu Apr 24 15:38:46 UTC 2014 - dmueller(a)suse.com + +- remove dependency on qt3 + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ scim-bridge.spec ++++++ --- /var/tmp/diff_new_pack.XYs4z6/_old 2014-04-26 10:11:48.000000000 +0200 +++ /var/tmp/diff_new_pack.XYs4z6/_new 2014-04-26 10:11:48.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package scim-bridge # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -22,7 +22,6 @@ BuildRequires: gtk2-devel BuildRequires: libqt4-devel BuildRequires: libtool -BuildRequires: qt3-devel BuildRequires: scim-devel Summary: Scim Bridge License: LGPL-2.1+ @@ -113,22 +112,14 @@ libtoolize --force -c --automake export CFLAGS="$RPM_OPT_FLAGS" -%configure --disable-static --with-pic --enable-gtk2-immodule --enable-qt3-immodule --enable-qt4-immodule --enable-documents +%configure --disable-static --with-pic --enable-gtk2-immodule --disable-qt3-immodule \ + --enable-qt4-immodule --enable-documents %{__make} %{?jobs:-j%jobs} %install make DESTDIR=${RPM_BUILD_ROOT} install rm -f $RPM_BUILD_ROOT/%{gtk_prefix}/%{_lib}/gtk-2.0/immodules/im-scim-bridge.*a -pushd $RPM_BUILD_ROOT/usr/lib/qt3/plugins/inputmethods/ - if [ %_lib = lib64 ]; then - mv im-scim-bridge.so im-scim-bridge.lib64.so - mv im-scim-bridge.la im-scim-bridge.lib64.la - else - : - fi -popd -rm -f $RPM_BUILD_ROOT/usr/lib/qt3/plugins/inputmethods/im-scim-bridge.*a mkdir -p $RPM_BUILD_ROOT/%qt4_plugindir/inputmethods mv $RPM_BUILD_ROOT/usr/plugins/inputmethods/im-scim-bridge* $RPM_BUILD_ROOT/%qt4_plugindir/inputmethods pushd $RPM_BUILD_ROOT/%qt4_plugindir/inputmethods @@ -182,13 +173,8 @@ %defattr(-, root, root) %{gtk_prefix}/%{_lib}/gtk-2.0/immodules - %files -n scim-bridge-qt %defattr(-, root, root) -%dir /usr/lib/qt3/ -%dir /usr/lib/qt3/plugins/ -%dir /usr/lib/qt3/plugins/inputmethods/ -/usr/lib/qt3/plugins/inputmethods/im-scim-bridge*.so %dir %qt4_plugindir/ %dir %qt4_plugindir/inputmethods/ %qt4_plugindir/inputmethods/im-scim-bridge*.so -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit rekonq for openSUSE:Factory
by root＠hilbert.suse.de 26 Apr '14

26 Apr '14

Hello community, here is the log from the commit of package rekonq for openSUSE:Factory checked in at 2014-04-26 10:11:26 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/rekonq (Old) and /work/SRC/openSUSE:Factory/.rekonq.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "rekonq" Changes: -------- --- /work/SRC/openSUSE:Factory/rekonq/rekonq.changes 2014-01-13 10:55:46.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.rekonq.new/rekonq.changes 2014-04-26 10:11:28.000000000 +0200 @@ -1,0 +2,5 @@ +Fri Mar 7 18:29:32 UTC 2014 - tittiatcoke(a)gmail.com + +- Remove nepomuk-core from the buildrequires. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rekonq.spec ++++++ --- /var/tmp/diff_new_pack.BxHFhd/_old 2014-04-26 10:11:29.000000000 +0200 +++ /var/tmp/diff_new_pack.BxHFhd/_new 2014-04-26 10:11:29.000000000 +0200 @@ -29,8 +29,7 @@ BuildRequires: libkactivities-devel BuildRequires: libkde4-devel >= 4.8.3 BuildRequires: libqca2-devel -BuildRequires: libqt4-devel >= 4.8.0 -BuildRequires: nepomuk-core-devel +BuildRequires: libqt4-devel >= 4.8.0l # for opera sync service BuildRequires: qoauth-devel %if 0%{?suse_version} -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0