March 2013 - openSUSE Commits - openSUSE Mailing Lists

commit openvpn for openSUSE:Factory
by root＠hilbert.suse.de 26 Mar '13

26 Mar '13

Hello community, here is the log from the commit of package openvpn for openSUSE:Factory checked in at 2013-03-26 19:48:27 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/openvpn (Old) and /work/SRC/openSUSE:Factory/.openvpn.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "openvpn", Maintainer is "mt(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/openvpn/openvpn.changes 2013-01-29 06:46:28.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.openvpn.new/openvpn.changes 2013-03-26 19:48:31.000000000 +0100 @@ -1,0 +2,53 @@ +Tue Mar 26 14:38:48 UTC 2013 - aj(a)suse.com + +- Remove _unitdir definition, it is provided by systemd. +- Install service file without x permissions + +------------------------------------------------------------------- +Mon Mar 25 14:55:35 UTC 2013 - p.drouand(a)gmail.com + +Update to version 2.3.0: + * Full IPv6 support + * SSL layer modularised, enabling easier implementation for other SSL libraries + * PolarSSL support as a drop-in replacement for OpenSSL + * New plug-in API providing direct certificate access, improved logging API + and easier to extend in the future + * Added 'dev_type' environment variable to scripts and plug-ins - which is + set to 'TUN' or 'TAP' + * New feature: --management-external-key - to provide access to the encryption + keys via the management interface + * New feature: --x509-track option, more fine grained access to X.509 fields + in scripts and plug-ins + * New feature: --client-nat support + * New feature: --mark which can mark encrypted packets from the tunnel, suitable + for more advanced routing and firewalling + * New feature: --management-query-proxy - manage proxy settings via the management + interface (supercedes --http-proxy-fallback) + * New feature: --stale-routes-check, which cleans up the internal routing table + * New feature: --x509-username-field, where other X.509v3 fields can be used for + the authentication instead of Common Name + * Improved client-kill management interface command + * Improved UTF-8 support - and added --compat-names to provide backwards compatibility + with older scripts/plug-ins + * Improved auth-pam with COMMONNAME support, passing the certificate's common + name in the PAM conversation + * More options can now be used inside <connection> blocks + * Completely new build system, enabling easier cross-compilation and Windows builds + * Much of the code has been better documented + * Many documentation updates + * Plenty of bug fixes and other code clean-ups +- Add systemd native support for OpenSUSE > 12.1 +- Adapt patchs to upstream release: + * openvpn-2.1-plugin-man.dif > openvpn-2.3-plugin-man.dif + * openvpn-2.1.0-man-dot.diff > openvpn-2.3.0-man-dot.diff +- Remove obsolete patchs; fixed or merged on upstream release: + * 0001-Use-SSL_MODE_RELEASE_BUFFERS-if-available.patch + * openvpn-2.1-plugin-build.dif + * openvpn-2.1-systemd-passwd.patch +- Rebase specfile to upstream changes: + * easy-rsa is not provided anymore with main package + * remove %clean section + * autoreconf -fi is no needed +- Update openvpn.keyring file for upstream release asc key + +------------------------------------------------------------------- Old: ---- 0001-Use-SSL_MODE_RELEASE_BUFFERS-if-available.patch openvpn-2.1-plugin-build.dif openvpn-2.1-plugin-man.dif openvpn-2.1-systemd-passwd.patch openvpn-2.2.1-man-dot.diff openvpn-2.2.2.tar.gz openvpn-2.2.2.tar.gz.asc New: ---- openvpn-2.3-plugin-man.dif openvpn-2.3.0-man-dot.diff openvpn-2.3.0.tar.gz openvpn-2.3.0.tar.gz.asc openvpn-tmpfile.conf openvpn.service ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ openvpn.spec ++++++ --- /var/tmp/diff_new_pack.0m0wjr/_old 2013-03-26 19:48:33.000000000 +0100 +++ /var/tmp/diff_new_pack.0m0wjr/_new 2013-03-26 19:48:33.000000000 +0100 @@ -16,46 +16,51 @@ # +%if 0%{?suse_version} > 1210 +%define with_systemd 1 +%else +%define with_systemd 0 +%endif + Name: openvpn Url: http://openvpn.net/ -%if 0%{?suse_version} +%if %{with_systemd} +%{?systemd_requires} +%else PreReq: %insserv_prereq %fillup_prereq %endif -Version: 2.2.2 +Version: 2.3.0 Release: 0 -%define upstream_version %version Summary: Full-featured SSL VPN solution using a TUN/TAP Interface License: SUSE-GPL-2.0-with-openssl-exception and LGPL-2.1 Group: Productivity/Networking/Security -Source: http://swupdate.openvpn.org/community/releases/openvpn-%{upstream_version}.… -Source1: http://swupdate.openvpn.org/community/releases/openvpn-%{upstream_version}.… -Source2: openvpn.init -Source3: openvpn.README.SUSE +Source: http://swupdate.openvpn.org/community/releases/openvpn-%{version}.tar.gz +Source1: http://swupdate.openvpn.org/community/releases/openvpn-%{version}.tar.gz.asc +Source2: %{name}.init +Source6: %{name}.sysconfig +Source3: %{name}.README.SUSE Source4: client-netconfig.up Source5: client-netconfig.down -Source6: openvpn.sysconfig Source7: %{name}.keyring -Patch1: %{name}-2.1-plugin-man.dif -Patch2: %{name}-2.1-plugin-build.dif -Patch3: openvpn-2.1-systemd-passwd.patch -Patch4: 0001-Use-SSL_MODE_RELEASE_BUFFERS-if-available.patch -Patch5: openvpn-2.2.1-man-dot.diff +Source8: %{name}.service +Source9: %{name}-tmpfile.conf +Patch1: %{name}-2.3-plugin-man.dif +Patch5: %{name}-2.3.0-man-dot.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildRequires: automake BuildRequires: gpg-offline BuildRequires: iproute2 BuildRequires: lzo-devel BuildRequires: openssl-devel BuildRequires: pam-devel -%if 0%{?suse_version} > 1010 -BuildRequires: libselinux-devel +%if %{with_systemd} +BuildRequires: systemd %endif -%if 0%{?suse_version} > 1030 +BuildRequires: libselinux-devel BuildRequires: pkcs11-helper-devel Requires: pkcs11-helper +%if %{with_systemd} +BuildRequires: systemd %endif -%define plugin_dir %{_libdir}/%{name}/plugin -%define plugin_libdir %{plugin_dir}/lib %description OpenVPN is a full-featured SSL VPN solution which can accommodate a wide @@ -76,12 +81,6 @@ OpenVPN is not a web application proxy and does not operate through a web browser. - - -Authors: --------- - James Yonan <jim(a)yonan.net> - %package down-root-plugin Summary: OpenVPN down-root plugin Group: Productivity/Networking/Security @@ -99,12 +98,6 @@ script. Thus, the down script will be run in the same execution environment as the up script. - - -Authors: --------- - James Yonan <jim(a)yonan.net> - %package auth-pam-plugin Summary: OpenVPN auth-pam plugin Group: Productivity/Networking/Security @@ -124,126 +117,113 @@ even if you drop openvpn daemon privileges using the user, group, or chroot directives. - - -Authors: --------- - James Yonan <jim(a)yonan.net> - %prep %gpg_verify %{S:1} -%setup -q -n %{name}-%{upstream_version} +%setup -q -n %{name}-%{version} %patch1 -p0 -%patch2 -p0 -%patch3 -p1 -%patch4 -p1 %patch5 -p0 -sed -e "s|@PLUGIN_DIR@|%{plugin_dir}|g" \ - -e "s|@PLUGIN_LIBDIR@|%{plugin_libdir}|g" \ - -e "s|@PLUGIN_DOCDIR@|%{_defaultdocdir}/%{name}|g" \ - -i openvpn.8 -# the build __DATE__ causes obs rebuild/republish of binaries; -# use the date of version.m4 file in the tar archive instead -sed -e "s|\" __DATE__|$(date '+%b %e %Y' -r version.m4)\"|g" -i options.c +sed -e "s|\" __DATE__|$(date '+%b %e %Y' -r version.m4)\"|g" -i src/openvpn/options.c + +# %%doc items shouldn't be executable. +find contrib sample -type f -perm +100 \ + -exec chmod a-x {} \; %build -autoreconf -fi export CFLAGS="$RPM_OPT_FLAGS -W -Wall -fno-strict-aliasing" export LDFLAGS %configure \ --enable-iproute2 \ --enable-x509-alt-username \ --enable-password-save \ + --enable-plugins \ + --enable-plugin-down-root \ + --enable-plugin-auth-pam \ --with-lzo-headers=%_includedir/lzo \ CFLAGS="$CFLAGS -fPIE $PLUGIN_DEFS" \ LDFLAGS="$LDFLAGS -pie -lpam -rdynamic -Wl,-rpath,%{_libdir}/%{name}/plugin/lib" make -# -# Build down-root plugin -# -pushd plugin/down-root -make -popd -# -# Build auth-pam plugin -# -pushd plugin/auth-pam -make -popd %install make DESTDIR=$RPM_BUILD_ROOT install +find $RPM_BUILD_ROOT -name '*.la' | xargs rm -f mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/openvpn mkdir -p $RPM_BUILD_ROOT/%{_localstatedir}/run/openvpn mkdir -p $RPM_BUILD_ROOT/%{_datadir}/openvpn +%if %{with_systemd} +install -D -m 644 $RPM_SOURCE_DIR/%{name}.service %{buildroot}/%{_unitdir}/%{name}.service +# tmpfiles.d +mkdir -p %{buildroot}%{_libexecdir}/tmpfiles.d +install -m 0644 $RPM_SOURCE_DIR/%{name}-tmpfile.conf %{buildroot}%{_libexecdir}/tmpfiles.d/%{name}.conf +%else install -D -m 755 $RPM_SOURCE_DIR/openvpn.init $RPM_BUILD_ROOT/%{_sysconfdir}/init.d/openvpn ln -sv %{_sysconfdir}/init.d/openvpn $RPM_BUILD_ROOT/%{_sbindir}/rcopenvpn -cp -p $RPM_SOURCE_DIR/openvpn.README.SUSE README.SUSE -install -m 755 $RPM_SOURCE_DIR/client-netconfig.up sample-scripts/client-netconfig.up -install -m 755 $RPM_SOURCE_DIR/client-netconfig.down sample-scripts/client-netconfig.down -find sample-* suse contrib -type f -exec chmod -x \{\} \; -chmod -x easy-rsa/2.0/{vars,openssl*.cnf} -chmod +x easy-rsa/1.0/{revoke-crt,make-crl,list-crl} -cp -rd easy-rsa $RPM_BUILD_ROOT%{_datadir}/openvpn/ -rm -rf $RPM_BUILD_ROOT%{_datadir}/openvpn/easy-rsa/Windows -# -# Install the plugins -# -install -d -m 755 $RPM_BUILD_ROOT%{plugin_libdir}/ -mv -f plugin/README README.plugins -for pi in auth-pam down-root; do - mv -f plugin/$pi/README README.$pi - install -m 755 plugin/$pi/openvpn-$pi.so \ - $RPM_BUILD_ROOT%{plugin_libdir}/ -done -# we install docs via spec into _defaultdocdir/name/management-notes.txt -rm -rf $RPM_BUILD_ROOT%{_datadir}/doc/{OpenVPN,%name} -# the /etc/sysconfig/openvpn template +# the /etc/sysconfig/openvpn template only with sysvinit, no needed with systemd install -d -m0755 %{buildroot}/var/adm/fillup-templates install -m0600 $RPM_SOURCE_DIR/openvpn.sysconfig \ %{buildroot}/var/adm/fillup-templates/sysconfig.openvpn +%endif +cp -p $RPM_SOURCE_DIR/openvpn.README.SUSE README.SUSE +install -m 755 $RPM_SOURCE_DIR/client-netconfig.up sample/sample-scripts/client-netconfig.up +install -m 755 $RPM_SOURCE_DIR/client-netconfig.down sample/sample-scripts/client-netconfig.down -%clean -if ! test -f /.buildenv; then rm -rf $RPM_BUILD_ROOT; fi +# we install docs via spec into _defaultdocdir/name/management-notes.txt +rm -rf $RPM_BUILD_ROOT%{_datadir}/doc/{OpenVPN,%name} %post +%if %{with_systemd} +%service_add_post %{name}.service +%else %{?fillup_and_insserv:%fillup_and_insserv} +%endif %preun +%if %{with_systemd} +%service_del_preun %{name}.service +%else %{?stop_on_removal:%stop_on_removal openvpn} +%endif %postun +%if %{with_systemd} +%service_del_postun %{name}.service +%else %{?insserv_cleanup:%insserv_cleanup} +%endif %files %defattr(-,root,root) %doc AUTHORS COPYING COPYRIGHT.GPL ChangeLog PORTS README +%doc src/plugins/{auth-pam/README.auth-pam,down-root/README.down-root} %doc README.* %doc contrib -%doc sample-config-files -%doc sample-keys -%doc sample-scripts -%doc suse -%doc management/management-notes.txt +%doc sample/sample-config-files +%doc sample/sample-keys +%doc sample/sample-scripts +%doc doc/management-notes.txt %doc %{_mandir}/man8/openvpn.8.gz %config(noreplace) %{_sysconfdir}/openvpn/ +%if %{with_systemd} +%{_unitdir}/%{name}.service +%{_libexecdir}/tmpfiles.d/%{name}.conf +%else %config %{_sysconfdir}/init.d/openvpn -%{_sbindir}/openvpn +/var/adm/fillup-templates/sysconfig.openvpn %{_sbindir}/rcopenvpn +%endif +%{_sbindir}/openvpn %attr(0755,root,root) %dir %ghost %{_localstatedir}/run/openvpn -%dir %{_datadir}/openvpn -%{_datadir}/openvpn/easy-rsa -%dir %{_libdir}/%{name} -%dir %{plugin_dir} -%dir %{plugin_libdir} -/var/adm/fillup-templates/sysconfig.openvpn +%{_includedir}/%{name}-plugin.h %files down-root-plugin %defattr(-,root,root) -%{plugin_libdir}/openvpn-down-root.so +%dir %{_libdir}/%{name} +%dir %{_libdir}/%{name}/plugins +%{_libdir}/%{name}/plugins/%{name}-plugin-down-root.so %files auth-pam-plugin %defattr(-,root,root) -%{plugin_libdir}/openvpn-auth-pam.so +%dir %{_libdir}/%{name} +%dir %{_libdir}/%{name}/plugins +%{_libdir}/%{name}/plugins/%{name}-plugin-auth-pam.so %changelog ++++++ openvpn-2.1-plugin-man.dif -> openvpn-2.3-plugin-man.dif ++++++ --- /work/SRC/openSUSE:Factory/openvpn/openvpn-2.1-plugin-man.dif 2011-09-23 12:21:02.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.openvpn.new/openvpn-2.3-plugin-man.dif 2013-03-26 19:48:31.000000000 +0100 @@ -1,8 +1,8 @@ Index: openvpn.8 =================================================================== ---- openvpn.8.orig -+++ openvpn.8 -@@ -2389,11 +2389,10 @@ plug-in modules, see the README file in +--- doc/openvpn.8.orig ++++ doc/openvpn.8 +@@ -2563,11 +2563,10 @@ folder of the OpenVPN source distribution. If you are using an RPM install of OpenVPN, see ++++++ openvpn-2.2.1-man-dot.diff -> openvpn-2.3.0-man-dot.diff ++++++ --- /work/SRC/openSUSE:Factory/openvpn/openvpn-2.2.1-man-dot.diff 2011-09-23 12:21:02.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.openvpn.new/openvpn-2.3.0-man-dot.diff 2013-03-26 19:48:31.000000000 +0100 @@ -1,6 +1,6 @@ ---- openvpn.8 -+++ openvpn.8 2011/08/29 18:26:40 -@@ -21,13 +21,13 @@ +--- doc/openvpn.8 ++++ doc/openvpn.8 +@@ -21,7 +21,7 @@ .\" 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA .\" .\" Manual page for openvpn @@ -9,10 +9,3 @@ .\" SH section heading .\" SS subsection heading .\" LP paragraph - .\" IP indented paragraph - .\" TP hanging label --.\ -+.\" - .\" .nf -- no formatting - .\" .fi -- resume formatting - .\" .ft 3 -- boldface ++++++ openvpn-2.2.2.tar.gz -> openvpn-2.3.0.tar.gz ++++++ ++++ 255467 lines of diff (skipped) ++++++ openvpn-tmpfile.conf ++++++ D /var/run/openvpn 0710 root openvpn - ++++++ openvpn.keyring ++++++ --- /var/tmp/diff_new_pack.0m0wjr/_old 2013-03-26 19:48:33.000000000 +0100 +++ /var/tmp/diff_new_pack.0m0wjr/_new 2013-03-26 19:48:33.000000000 +0100 @@ -1,33 +1,30 @@ -pub 1024D/1FBF51F3 2003-11-20 -uid James Yonan <jim(a)yonan.net> -sub 2048g/4B9741E3 2003-11-20 - -----BEGIN PGP PUBLIC KEY BLOCK----- -Version: GnuPG v2.0.19 (GNU/Linux) +Version: GnuPG v1.4.9 (GNU/Linux) -mQGiBD+9OaARBAC41lHwut4og8RL+QvChit93Yg8JloaZzqvKQHMKvcb14OY27QB -00oEtwxotBRkvJHy/cR4feK9Itje556FbzC7ODesYtjZh1V81B2ep4tfwRQSPqZT -xy2jwzW5SwReBuIPxBOFts+OeeLQuKFU/VSItU9abA51cvKEvaV0CZx6ZwCg/h70 -OgABmkCl8u+nHK2EHMSjZAUD/RP1jLNub1wlg2vJvfty+Nu7PoDJxSG7LzsSFC6W -a5KiryIMvokp3cZQ7EnTG1Jc5y5tsZrRfTa7QLcooQrYivWSCSldkAowEh/tUGwb -CurQZtDAmmuqLJAG+zDh6qFINHPnkVZBMuN+Lhkg0gqo+Mgsjn0ZzuGgQYb2b3wn -pXckBACZE6EJSnICN/Cn5657of5znOwixZUdl4Pvsv7X5LuUJ0SeUtfSjNfUFu0b -j/s0BXpQ/Y933rS+m0axbiElRNHzwtBb4W+TzwLvkwHw5WrIw5tcZXcZpos1NkhW -lUDKLQ63WMqg5SBpilo3/wFU4+ngvPMcfbL1vgMYuuWfSPRt5LQbSmFtZXMgWW9u -YW4gPGppbUB5b25hbi5uZXQ+iF4EExECAB4FAj+9OaACGwMGCwkIBwMCAxUCAwMW -AgECHgECF4AACgkQHQtJlh+/UfMaFgCeOIDuybiePnFpYbm7faiqT34NvzYAoLjO -ob+WiwJECbjpV62fmItBsYI9uQINBD+9OcAQCAC4wi4knBzA3bGbb2XSnZcIt+Tf -9JGXoG7+cpLT6wGZqzaAHNdgiZZf5Gdod9ud3CcLwrc1WXJljZXBhnpNNypen6O9 -uGCb9OXKO7PuYV014D0pKv96rYtgPNE7MUO101lDt7bE8Zmw+HmOpyf6TnIg8GWw -3Vj8n0HfGvsx/WW2PZ1tXxUFAbsVIU/W5EJlCAhJbaZZCBj+P0QJFGuP41E7V0iO -2UMGRbzoQrwmGQopjVrzXcWAr5NvKKd8HL4ESkp8xdZrhCukNIBE9EEt6H+EvPut -KdvpH2fIUTyEeZY4zDtm0ZS0zGZBET9SdcX/+sAuseiojPKd/D67oMG5FcF7AAMG -CACfOcVjPcqYAhkGo6HNrpU7HMuaxy3Tuy5HI+4kU/POlLlm2AsfmHr4BtRCFMBt -uNxybJwMMew1o1E4H4RvTEfPpVS0WW2lkOcpet429xf4oX1HL2nvlLmOAaMKgLhL -ZxPPTCzmjyIVIeRF8BC+VQYh346v/LocO2obbD0chO0mApVgxVhO4E0vlu0Rdmsp -d7+mCuani1wS9n0lgYVnHYdxRPL/AWj11KDgKm2LjoJt0WHHyEHGMjJTUB0JhM2a -EfWkimDELeAb3pjdVEtmW6aF+q8sd6tn+mM0Z2I+6kwiMsdoWzjosuvXPzFsvkWq -0QY2wWyYYsNaXscfjKnjBUcpiEkEGBECAAkFAj+9OcACGwwACgkQHQtJlh+/UfOR -TACgpg5MZJMgULtP31swTRmPGZ3driAAniP+Xg3U2KxAiS9Mxf0BOen8FgW5 -=eZlZ ------END PGP PUBLIC KEY BLOCK----- +mQGiBEsHuu4RBACnPwEKcLYmlwe8v2e8xizlO1fCeqOA7zj6tU/T/1+YTJhrVbgW +PiRYSNKAmAq0uLFLQ14KpIDsrtdi5ySeUTf64kJtDrBa2si6h0HUyNHf9EX6rUVC +g/CTpsfYEkqlfMoBH7w7L5O2yidwWA+F4RGWhruzP7i1z+bBsIguSxiBzwCg5qPh +pgkFGeWArp/OUBHkaqmPZ00D/08dmkrez9d7C/PoR/cFq0nQBqL3zmsRxv66I6fM +TUqwaRpweWHh9P6XR+pTJjBglVSvk9kLv+PYCvk7yxbT3M6OA/GrSEp/53itlzOU +MPkv/OF6BmbRbYJK5HAsZgHGbuZxUHUqm4qJ+t4+WZaz9i8WtYbOM6T9aNWQrVUW +dUMqA/4tZlHJzCrd1NbfEetQVeso9rzzWWWmDAusbvkowfrFHXJGUjfL0hBmxj/9 +JmZtwU+i8G+MKQS0w9rCVLEMLoHLLxPH+Jiknz3Y2xE6CbiSvL+8cvOolgADz/06 +MniHKOZb4tPFPw7ObESeAGp4T9FgT53fJ14AMjGLyHv6EXbfvbQsU2FtdWxpIFNl +cHDDpG5lbiA8c2FtdWxpLnNlcHBhbmVuQGdtYWlsLmNvbT6IYAQTEQIAIAUCSwe6 +7gIbAwYLCQgHAwIEFQIIAwQWAgMBAh4BAheAAAoJEMKdl+0ZjSKjsfsAoK6khXtq +w2xDtNBv/UhRhuVH0NQOAKCDWiB2zYNvHWLYnuIpAlE1sAnGPrkCDQRLB7ruEAgA +jwSEfTWLJsIW5qlKNEhySIjmRmcVgqB/NTaZ+Nd/r++stYSan1qb7qlQ3B3w48p1 +gB0SPfwKRmMkiYsHNcbRr5KIHWTnYrMI/5OAjPIiz/2j294wRnObzrbJK3T+qJSL +A2mEXXPPK7i0hUwH12ZJej/h98lPQA+NiDgDOaq4asyq4pcHrR2T2NyiiR2+Xi/L +2Lz1zKj4iQ3f5g0ktmAEdGcDtV7tI0xZeXWEtesRXeXmqPmjLskJozUoZP1GXXAz +80PySK2HsEQ/846q1Ybl5KYwbSH+l8jLIyqMDTQnCYG+Ft1moCk3HLyc4c1ALVov +1Rvom8u3dM5tUtpuZMwcJwADBQf+MCohqLqGJmEdiTEnmggsiKSoZTIBJhcujRaL +pxPpBlXz6P2bvlprUedBs+zxEEI+Q/CqIlyYaN+Kca1FK4YG9iQoHmb9IIVHf4C/ +lyWSx1xK+BnIk7SEfMjpGAjofNzNc34NmebnosHfP/g3ruLo6EgtjQ68iUty9PgX +Q1bZQ/SeXk16b8Nn0xQa9S+hg5LAxA+DuSvXbMqU5q2p8JlPgGEFVKzaVcxPhppB +Kcv/2CxjsqXj/6sW3nFSw+8Jd4SWL1+cPZ1v1WHG3SUMFoLAjSmVj3X8roG5EiLi +QxSGOUz8uVtvumfKyd25MYmgHMELL7fxhrZcw2OVdo977lt2fIhJBBgRAgAJBQJL +B7ruAhsMAAoJEMKdl+0ZjSKjgrAAoLeln17YxSQA7RUHwTbquOA92odMAKDiq7c8 +p2hUs3rZaXY1aMmExyB0gQ== +=l5lk +-----END PGP PUBLIC KEY BLOCK----- \ No newline at end of file ++++++ openvpn.service ++++++ [Unit] Description=OpenVPN Robust And Highly Flexible Tunneling Application On %I After=syslog.target network.target [Service] PrivateTmp=true Type=forking PIDFile=/var/run/openvpn/%i.pid ExecStart=/usr/sbin/openvpn --daemon --writepid /var/run/openvpn/%i.pid --cd /etc/openvpn/ --config %i.conf [Install] WantedBy=multi-user.target -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit opal for openSUSE:Factory
by root＠hilbert.suse.de 26 Mar '13

26 Mar '13

Hello community, here is the log from the commit of package opal for openSUSE:Factory checked in at 2013-03-26 19:48:21 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/opal (Old) and /work/SRC/openSUSE:Factory/.opal.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "opal", Maintainer is "LZWang(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/opal/opal.changes 2012-12-19 11:15:40.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.opal.new/opal.changes 2013-03-26 19:48:23.000000000 +0100 @@ -1,0 +2,10 @@ +Tue Feb 26 10:22:43 UTC 2013 - dimstar(a)opensuse.org + +- Update to version 3.10.10: + + Several fixes for H.323. + + Fix subscribing/unsubscribing when enabling and disabling SIP + accounts. + + Bug fixes. +- Drop opal-server-flood.patch: fixed upstream. + +------------------------------------------------------------------- Old: ---- opal-3.10.9.tar.xz opal-server-flood.patch New: ---- opal-3.10.10.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ opal.spec ++++++ --- /var/tmp/diff_new_pack.IEIqgS/_old 2013-03-26 19:48:25.000000000 +0100 +++ /var/tmp/diff_new_pack.IEIqgS/_new 2013-03-26 19:48:25.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package opal # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 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 @@ -47,10 +47,10 @@ License: MPL-1.0 Group: System/Libraries Url: http://www.opalvoip.org/ -Version: 3.10.9 +Version: 3.10.10 Release: 0 # FIXME: we should probably list all plugins in %%files to make sure we don't lose some when updating the package. -%define _version 3_10_9 +%define _version 3_10_10 Source0: http://download.gnome.org/sources/opal/3.10/%{name}-%{version}.tar.xz # PATCH-FIX-UPSTREAM opal-system-libgsm.patch vuntz(a)novell.com -- Fix detection of system libgsm Patch1: opal-system-libgsm.patch @@ -58,8 +58,6 @@ Patch2: opal-fix-ambiguous.patch # PATCH-FIX-UPSTREAM opal-use-pkgconfig-for-PTLib.patch zaitor(a)opensuse.org -- Use pkgconfig for PTLib, taken from upstream svn, fixes build. Patch4: opal-use-pkgconfig-for-PTLib.patch -# PATCH-FIX-UPSTREAM opal-server-flood.patch idoenmez(a)suse.de -- Fix server flood, upstream r28644 and r28650, bgo#690144 -Patch5: opal-server-flood.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -101,7 +99,6 @@ %patch1 -p1 %patch2 -p1 %patch4 -p1 -%patch5 -p1 # this subdir contains GPL - to avoid license issues delete it before build rm -rf plugins/LID/VPB @@ -132,7 +129,7 @@ %files -n lib%{name}%{_version} %defattr(-,root,root) -%doc mpl-1.0.htm Change* +%doc mpl-1.0.htm %dir %{_libdir}/%{name}-%{version}/ %dir %{_libdir}/%{name}-%{version}/codecs %dir %{_libdir}/%{name}-%{version}/codecs/audio ++++++ opal-3.10.9.tar.xz -> opal-3.10.10.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/opal-3.10.9/ChangeLog-opal-v3_10_9.txt new/opal-3.10.10/ChangeLog-opal-v3_10_9.txt --- old/opal-3.10.9/ChangeLog-opal-v3_10_9.txt 2012-11-26 11:49:30.000000000 +0100 +++ new/opal-3.10.10/ChangeLog-opal-v3_10_9.txt 1970-01-01 01:00:00.000000000 +0100 @@ -1,60 +0,0 @@ -2012-10-05 06:20 rjongbloed - - * [r28477] version.h: - Update version number for beta v3.10.9 - -2012-11-20 23:44 rjongbloed - - * [r28560] samples/codectest/main.cxx: - Changed order of video grabber initialisation, some combinations - or format/size do not work, thanks Marco Costantini - -2012-11-22 00:10 rjongbloed - - * [r28567] samples/openphone/OpenPhone_2008.vcproj: - Better flexibility on location of wxrc.exe - -2012-11-25 23:50 rjongbloed - - * [r28574] revision.h.in: - Fixed comment - -2012-11-26 04:03 rjongbloed - - * [r28578] samples/openphone/OpenPhone_2010.vcxproj: - Better flexibility on location of wxrc.exe - -2012-11-26 05:46 rjongbloed - - * [r28579] include/h323/h323con.h, include/h323/h323ep.h, - samples/openphone/main.cxx, src/h323/h323.cxx, - src/h323/h323ep.cxx: - Fixed loss of media if do multiple hold/retrieve on H.323. Some - old OpenH323 hold handling for Music on Hold getting in the way. - - Added pause of transmit media (microphone/camera) when putting - remote on hold. The stack does not do this as this is where Music - on Hold goes, but OpenPhone does not (yet) support that so it - needs to shut down the media or the remote non-intuitively can - still hear the local user while on hold. - -2012-11-26 07:32 rjongbloed - - * [r28581] src/opal/pcss.cxx: - Fix for "pc:*" using default sound channel device names from - OpalPCSSEndPoint - -2012-11-26 07:33 rjongbloed - - * [r28582] samples/openphone/main.cxx: - Pausing media streams on hold causes problems, change to do an - "internal transfer" to new "Null Audio" device to prevent - microphone going out to held endpoint in OpenPhone. - -2012-11-26 10:14 rjongbloed - - * [r28587] src/win32/opal_2008.dtf, src/win32/opal_2010.dtf, - src/win32/opald_2008.dtf, src/win32/opald_2010.dtf, - src/win32/opaln_2008.dtf, src/win32/opaln_2010.dtf: - Update symbols - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/opal-3.10.9/Makefile.in new/opal-3.10.10/Makefile.in --- old/opal-3.10.9/Makefile.in 2012-11-26 11:49:22.000000000 +0100 +++ new/opal-3.10.10/Makefile.in 2013-02-20 03:18:59.000000000 +0100 @@ -21,9 +21,9 @@ # # Contributor(s): ______________________________________. # -# $Revision: 27055 $ -# $Author: ededu $ -# $Date: 2012-02-25 05:58:48 -0600 (Sat, 25 Feb 2012) $ +# $Revision: 29051 $ +# $Author: rjongbloed $ +# $Date: 2013-01-29 22:22:11 -0600 (Tue, 29 Jan 2013) $ # include opal_defs.mak @@ -365,6 +365,8 @@ endif +ifneq (,$(SWIG)) + #################################################### # Java interface @@ -392,6 +394,8 @@ endif +endif # SWIG + ################## # T.38 Fax diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/opal-3.10.9/configure new/opal-3.10.10/configure --- old/opal-3.10.9/configure 2012-11-26 11:49:22.000000000 +0100 +++ new/opal-3.10.10/configure 2013-02-20 03:18:59.000000000 +0100 @@ -5339,7 +5339,6 @@ EXPANDED_PLUGIN_DIR=`echo ${EXPANDED_PLUGIN_DIR} | sed s#\\${exec_prefix}#${exec_prefix}#` fi -echo $OSTYPE $target_os case "$OSTYPE" in cygwin | mingw ) EXPANDED_PLUGIN_DIR="plugins" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/opal-3.10.9/configure.ac new/opal-3.10.10/configure.ac --- old/opal-3.10.9/configure.ac 2012-11-26 11:49:22.000000000 +0100 +++ new/opal-3.10.10/configure.ac 2013-02-20 03:18:59.000000000 +0100 @@ -164,7 +164,6 @@ EXPANDED_PLUGIN_DIR=`echo ${EXPANDED_PLUGIN_DIR} | sed s#\\${exec_prefix}#${exec_prefix}#` fi -echo $OSTYPE $target_os case "$OSTYPE" in cygwin | mingw ) EXPANDED_PLUGIN_DIR="plugins" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/opal-3.10.9/include/opal/call.h new/opal-3.10.10/include/opal/call.h --- old/opal-3.10.9/include/opal/call.h 2012-11-26 11:48:39.000000000 +0100 +++ new/opal-3.10.10/include/opal/call.h 2013-02-20 03:18:20.000000000 +0100 @@ -24,9 +24,9 @@ * * Contributor(s): ______________________________________. * - * $Revision: 27984 $ + * $Revision: 28690 $ * $Author: rjongbloed $ - * $Date: 2012-07-10 03:24:24 -0500 (Tue, 10 Jul 2012) $ + * $Date: 2012-12-18 20:47:15 -0600 (Tue, 18 Dec 2012) $ */ #ifndef OPAL_OPAL_CALL_H @@ -602,6 +602,7 @@ PTime startTime; bool isEstablished; bool isClearing; + PAtomicBoolean m_isCleared; OpalConnection::CallEndReason callEndReason; std::list<PSyncPoint *> m_endCallSyncPoint; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/opal-3.10.9/include/sip/sippdu.h new/opal-3.10.10/include/sip/sippdu.h --- old/opal-3.10.9/include/sip/sippdu.h 2012-11-26 11:48:40.000000000 +0100 +++ new/opal-3.10.10/include/sip/sippdu.h 2013-02-20 03:18:21.000000000 +0100 @@ -24,9 +24,9 @@ * * Contributor(s): ______________________________________. * - * $Revision: 27589 $ + * $Revision: 29080 $ * $Author: rjongbloed $ - * $Date: 2012-05-07 23:01:54 -0500 (Mon, 07 May 2012) $ + * $Date: 2013-02-12 18:52:05 -0600 (Tue, 12 Feb 2013) $ */ #ifndef OPAL_SIP_SIPPDU_H @@ -234,6 +234,7 @@ bool reversed = false ); PString ToString() const; + friend ostream & operator<<(ostream & strm, const SIPURLList & urls); }; @@ -646,8 +647,7 @@ PString CreateVia( SIPEndPoint & endpoint, - const OpalTransport & transport, - SIPConnection * connection = NULL + const OpalTransport & transport ); /**Read PDU from the specified transport. @@ -820,6 +820,7 @@ PCaselessString m_proxyAddress; PCaselessString m_addressOfRecord; PCaselessString m_contactAddress; + PCaselessString m_interface; SIPMIMEInfo m_mime; PString m_authID; PString m_password; @@ -936,8 +937,9 @@ }; -#define OPAL_PROXY_PARAM "OPAL-proxy" -#define OPAL_LOCAL_ID_PARAM "OPAL-local-id" +#define OPAL_PROXY_PARAM "OPAL-proxy" +#define OPAL_LOCAL_ID_PARAM "OPAL-local-id" +#define OPAL_INTERFACE_PARAM "OPAL-interface" ///////////////////////////////////////////////////////////////////////// diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/opal-3.10.9/revision.h.in new/opal-3.10.10/revision.h.in --- old/opal-3.10.9/revision.h.in 2012-11-26 12:03:12.000000000 +0100 +++ new/opal-3.10.10/revision.h.in 2013-02-20 03:19:51.000000000 +0100 @@ -1,4 +1,4 @@ -/* +/* * revision.h * * SVN revision number header file for OPAL @@ -22,7 +22,7 @@ * * Contributor(s): ______________________________________. * - * $Revision: 28574 $ + * $Revision: 29150 $ */ #ifndef _OPAL_REVISION_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/opal-3.10.9/samples/callgen/callgen_2010.vcxproj new/opal-3.10.10/samples/callgen/callgen_2010.vcxproj --- old/opal-3.10.9/samples/callgen/callgen_2010.vcxproj 2012-11-26 11:49:19.000000000 +0100 +++ new/opal-3.10.10/samples/callgen/callgen_2010.vcxproj 2013-02-20 03:18:57.000000000 +0100 @@ -74,6 +74,7 @@ <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <WarningLevel>Level4</WarningLevel> <SuppressStartupBanner>true</SuppressStartupBanner> + <PrecompiledHeaderOutputFile>$(VS_PCH_DIR)$(IntDir)$(TargetName).pch</PrecompiledHeaderOutputFile> </ClCompile> <ResourceCompile> <PreprocessorDefinitions>NDEBUG;_AFXDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions> @@ -113,6 +114,7 @@ <WarningLevel>Level4</WarningLevel> <SuppressStartupBanner>true</SuppressStartupBanner> <DebugInformationFormat>EditAndContinue</DebugInformationFormat> + <PrecompiledHeaderOutputFile>$(VS_PCH_DIR)$(IntDir)$(TargetName).pch</PrecompiledHeaderOutputFile> </ClCompile> <ResourceCompile> <PreprocessorDefinitions>_DEBUG;_AFXDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/opal-3.10.9/samples/codectest/codectest_2010.vcxproj new/opal-3.10.10/samples/codectest/codectest_2010.vcxproj --- old/opal-3.10.9/samples/codectest/codectest_2010.vcxproj 2012-11-26 11:49:21.000000000 +0100 +++ new/opal-3.10.10/samples/codectest/codectest_2010.vcxproj 2013-02-20 03:18:58.000000000 +0100 @@ -81,6 +81,7 @@ <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <WarningLevel>Level4</WarningLevel> <SuppressStartupBanner>true</SuppressStartupBanner> + <PrecompiledHeaderOutputFile>$(VS_PCH_DIR)$(IntDir)$(TargetName).pch</PrecompiledHeaderOutputFile> </ClCompile> <ResourceCompile> <PreprocessorDefinitions>NDEBUG;_AFXDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions> @@ -120,6 +121,7 @@ <WarningLevel>Level4</WarningLevel> <SuppressStartupBanner>true</SuppressStartupBanner> <DebugInformationFormat>EditAndContinue</DebugInformationFormat> + <PrecompiledHeaderOutputFile>$(VS_PCH_DIR)$(IntDir)$(TargetName).pch</PrecompiledHeaderOutputFile> </ClCompile> <ResourceCompile> <PreprocessorDefinitions>_DEBUG;_AFXDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/opal-3.10.9/samples/faxopal/FaxOPAL_2010.vcxproj new/opal-3.10.10/samples/faxopal/FaxOPAL_2010.vcxproj --- old/opal-3.10.9/samples/faxopal/FaxOPAL_2010.vcxproj 2012-11-26 11:49:14.000000000 +0100 +++ new/opal-3.10.10/samples/faxopal/FaxOPAL_2010.vcxproj 2013-02-20 03:18:52.000000000 +0100 @@ -74,6 +74,7 @@ <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <WarningLevel>Level4</WarningLevel> <SuppressStartupBanner>true</SuppressStartupBanner> + <PrecompiledHeaderOutputFile>$(VS_PCH_DIR)$(IntDir)$(TargetName).pch</PrecompiledHeaderOutputFile> </ClCompile> <ResourceCompile> <PreprocessorDefinitions>NDEBUG;_AFXDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions> @@ -112,6 +113,7 @@ <WarningLevel>Level4</WarningLevel> <SuppressStartupBanner>true</SuppressStartupBanner> <DebugInformationFormat>EditAndContinue</DebugInformationFormat> + <PrecompiledHeaderOutputFile>$(VS_PCH_DIR)$(IntDir)$(TargetName).pch</PrecompiledHeaderOutputFile> </ClCompile> <ResourceCompile> <PreprocessorDefinitions>_DEBUG;_AFXDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/opal-3.10.9/samples/ivropal/IvrOPAL_2010.vcxproj new/opal-3.10.10/samples/ivropal/IvrOPAL_2010.vcxproj --- old/opal-3.10.9/samples/ivropal/IvrOPAL_2010.vcxproj 2012-11-26 11:49:21.000000000 +0100 +++ new/opal-3.10.10/samples/ivropal/IvrOPAL_2010.vcxproj 2013-02-20 03:18:58.000000000 +0100 @@ -73,6 +73,7 @@ <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <WarningLevel>Level4</WarningLevel> <SuppressStartupBanner>true</SuppressStartupBanner> + <PrecompiledHeaderOutputFile>$(VS_PCH_DIR)$(IntDir)$(TargetName).pch</PrecompiledHeaderOutputFile> </ClCompile> <ResourceCompile> <PreprocessorDefinitions>NDEBUG;_AFXDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions> @@ -111,6 +112,7 @@ <WarningLevel>Level4</WarningLevel> <SuppressStartupBanner>true</SuppressStartupBanner> <DebugInformationFormat>EditAndContinue</DebugInformationFormat> + <PrecompiledHeaderOutputFile>$(VS_PCH_DIR)$(IntDir)$(TargetName).pch</PrecompiledHeaderOutputFile> </ClCompile> <ResourceCompile> <PreprocessorDefinitions>_DEBUG;_AFXDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/opal-3.10.9/samples/ivropal/test.vxml new/opal-3.10.10/samples/ivropal/test.vxml --- old/opal-3.10.9/samples/ivropal/test.vxml 2012-11-26 11:49:21.000000000 +0100 +++ new/opal-3.10.10/samples/ivropal/test.vxml 2013-02-20 03:18:58.000000000 +0100 @@ -2,14 +2,17 @@ <vxml version="2.1" xmlns="http://www.w3.org/2001/vxml"> <log expr="'Started test VXML script'" /> -  + <var name="TestGoto" expr="'MainMenu'"/> + <var name="TestWAV" expr="'../callgen/ogm.wav'"/> + +  <menu id="MainMenu">  <property name="timeout" value="30s"/>  - <prompt> + <prompt bargein="false">  <audio src="file:menu_prompt.wav"> Welcome to the OPAL I V R example. @@ -62,12 +65,12 @@ <form id="PlayFile"> <log expr="'Playing WAV file'"/> - <audio src="file:../callgen/ogm.wav"/> + <audio expr="application.TestWAV"/> <break time="5s"/> - <audio src="file:../callgen/ogm.wav"/> + <audio expr="application.TestWAV"/>  - <goto nextitem="MainMenu"/> + <goto expritem="application.TestGoto"/> </form>  @@ -112,7 +115,7 @@ </audio>  - <goto next="#MainMenu"/> + <goto expr="'#'+application.TestGoto"/> </error> </transfer> </form> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/opal-3.10.9/samples/jester/jester_2010.vcxproj new/opal-3.10.10/samples/jester/jester_2010.vcxproj --- old/opal-3.10.9/samples/jester/jester_2010.vcxproj 2012-11-26 11:49:18.000000000 +0100 +++ new/opal-3.10.10/samples/jester/jester_2010.vcxproj 2013-02-20 03:18:55.000000000 +0100 @@ -123,7 +123,7 @@ <RuntimeTypeInfo>true</RuntimeTypeInfo> <PrecompiledHeader>Use</PrecompiledHeader> <PrecompiledHeaderFile>ptlib.h</PrecompiledHeaderFile> - <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName).pch</PrecompiledHeaderOutputFile> + <PrecompiledHeaderOutputFile>$(VS_PCH_DIR)$(IntDir)$(TargetName).pch</PrecompiledHeaderOutputFile> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <WarningLevel>Level4</WarningLevel> <SuppressStartupBanner>true</SuppressStartupBanner> @@ -161,7 +161,7 @@ <RuntimeTypeInfo>true</RuntimeTypeInfo> <PrecompiledHeader>Use</PrecompiledHeader> <PrecompiledHeaderFile>ptlib.h</PrecompiledHeaderFile> - <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName).pch</PrecompiledHeaderOutputFile> + <PrecompiledHeaderOutputFile>$(VS_PCH_DIR)$(IntDir)$(TargetName).pch</PrecompiledHeaderOutputFile> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <WarningLevel>Level4</WarningLevel> <SuppressStartupBanner>true</SuppressStartupBanner> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/opal-3.10.9/samples/opalecho/opalecho_2010.vcxproj new/opal-3.10.10/samples/opalecho/opalecho_2010.vcxproj --- old/opal-3.10.9/samples/opalecho/opalecho_2010.vcxproj 2012-11-26 11:49:15.000000000 +0100 +++ new/opal-3.10.10/samples/opalecho/opalecho_2010.vcxproj 2013-02-20 03:18:52.000000000 +0100 @@ -67,7 +67,7 @@ <RuntimeTypeInfo>true</RuntimeTypeInfo> <PrecompiledHeader>Use</PrecompiledHeader> <PrecompiledHeaderFile>precompile.h</PrecompiledHeaderFile> - <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName).pch</PrecompiledHeaderOutputFile> + <PrecompiledHeaderOutputFile>$(VS_PCH_DIR)$(IntDir)$(TargetName).pch</PrecompiledHeaderOutputFile> <ProgramDataBaseFileName>$(TargetDir)\$(TargetName).pdb</ProgramDataBaseFileName> <WarningLevel>Level4</WarningLevel> <SuppressStartupBanner>true</SuppressStartupBanner> @@ -105,7 +105,7 @@ <RuntimeTypeInfo>true</RuntimeTypeInfo> <PrecompiledHeader>Use</PrecompiledHeader> <PrecompiledHeaderFile>precompile.h</PrecompiledHeaderFile> - <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName).pch</PrecompiledHeaderOutputFile> + <PrecompiledHeaderOutputFile>$(VS_PCH_DIR)$(IntDir)$(TargetName).pch</PrecompiledHeaderOutputFile> <ProgramDataBaseFileName>$(TargetDir)\$(TargetName).pdb</ProgramDataBaseFileName> <WarningLevel>Level4</WarningLevel> <SuppressStartupBanner>true</SuppressStartupBanner> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/opal-3.10.9/samples/opalgw/opalgw_2010.vcxproj new/opal-3.10.10/samples/opalgw/opalgw_2010.vcxproj --- old/opal-3.10.9/samples/opalgw/opalgw_2010.vcxproj 2012-11-26 11:49:14.000000000 +0100 +++ new/opal-3.10.10/samples/opalgw/opalgw_2010.vcxproj 2013-02-20 03:18:51.000000000 +0100 @@ -68,7 +68,7 @@ <RuntimeTypeInfo>true</RuntimeTypeInfo> <PrecompiledHeader>Use</PrecompiledHeader> <PrecompiledHeaderFile>precompile.h</PrecompiledHeaderFile> - <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName).pch</PrecompiledHeaderOutputFile> + <PrecompiledHeaderOutputFile>$(VS_PCH_DIR)$(IntDir)$(TargetName).pch</PrecompiledHeaderOutputFile> <ProgramDataBaseFileName>$(TargetDir)\$(TargetName).pdb</ProgramDataBaseFileName> <WarningLevel>Level4</WarningLevel> <SuppressStartupBanner>true</SuppressStartupBanner> @@ -106,7 +106,7 @@ <RuntimeTypeInfo>true</RuntimeTypeInfo> <PrecompiledHeader>Use</PrecompiledHeader> <PrecompiledHeaderFile>precompile.h</PrecompiledHeaderFile> - <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName).pch</PrecompiledHeaderOutputFile> + <PrecompiledHeaderOutputFile>$(VS_PCH_DIR)$(IntDir)$(TargetName).pch</PrecompiledHeaderOutputFile> <ProgramDataBaseFileName>$(TargetDir)\$(TargetName).pdb</ProgramDataBaseFileName> <WarningLevel>Level4</WarningLevel> <SuppressStartupBanner>true</SuppressStartupBanner> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/opal-3.10.9/samples/opalmcu/OPAL_MCU_2010.vcxproj new/opal-3.10.10/samples/opalmcu/OPAL_MCU_2010.vcxproj --- old/opal-3.10.9/samples/opalmcu/OPAL_MCU_2010.vcxproj 2012-11-26 11:49:18.000000000 +0100 +++ new/opal-3.10.10/samples/opalmcu/OPAL_MCU_2010.vcxproj 2013-02-20 03:18:56.000000000 +0100 @@ -73,6 +73,7 @@ <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <WarningLevel>Level4</WarningLevel> <SuppressStartupBanner>true</SuppressStartupBanner> + <PrecompiledHeaderOutputFile>$(VS_PCH_DIR)$(IntDir)$(TargetName).pch</PrecompiledHeaderOutputFile> </ClCompile> <ResourceCompile> <PreprocessorDefinitions>NDEBUG;_AFXDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions> @@ -111,6 +112,7 @@ <WarningLevel>Level4</WarningLevel> <SuppressStartupBanner>true</SuppressStartupBanner> <DebugInformationFormat>EditAndContinue</DebugInformationFormat> + <PrecompiledHeaderOutputFile>$(VS_PCH_DIR)$(IntDir)$(TargetName).pch</PrecompiledHeaderOutputFile> </ClCompile> <ResourceCompile> <PreprocessorDefinitions>_DEBUG;_AFXDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/opal-3.10.9/samples/openphone/OpenPhone.wxs new/opal-3.10.10/samples/openphone/OpenPhone.wxs --- old/opal-3.10.9/samples/openphone/OpenPhone.wxs 2012-11-26 11:49:18.000000000 +0100 +++ new/opal-3.10.10/samples/openphone/OpenPhone.wxs 2013-02-20 03:18:55.000000000 +0100 @@ -2,7 +2,7 @@ <?define LuaDir = "$(env.ProgramFiles)\lua\5.1" ?> <?define SaslDir = "C:\Tools" ?> <?define LDAPDir = "C:\Tools" ?> -<?define SSLDir = "$(env.windir)\SYSTEM32" ?> +<?define SSLDir = "C:\Tools" ?> <?define OPALDir = "..\.." ?> <?define PTLibDir = "..\..\..\ptlib" ?> <?define PluginDir = "C:\PTLib_Plugins" ?> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/opal-3.10.9/samples/openphone/OpenPhone_2008.vcproj new/opal-3.10.10/samples/openphone/OpenPhone_2008.vcproj --- old/opal-3.10.9/samples/openphone/OpenPhone_2008.vcproj 2012-11-26 11:49:18.000000000 +0100 +++ new/opal-3.10.10/samples/openphone/OpenPhone_2008.vcproj 2013-02-20 03:18:55.000000000 +0100 @@ -312,13 +312,13 @@ <ProjectReference ReferencedProjectIdentifier="{C7546C76-E010-4105-AEAE-48FCD6C09527}" UseDependenciesInBuild="false" - RelativePathToProject=".\src\win32\opal_dll_2008.vcproj" + RelativePathToProject="..\..\src\win32\opal_dll_2008.vcproj" /> <ProjectReference ReferencedProjectIdentifier="{85F4F26A-1A5D-4685-A48A-448102C5C5BC}" UseInBuild="false" UseDependenciesInBuild="false" - RelativePathToProject="..\ptlib\src\ptlib\msos\PTLib_2008.vcproj" + RelativePathToProject="..\..\..\ptlib\src\ptlib\msos\PTLib_2008.vcproj" /> </References> <Files> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/opal-3.10.9/samples/openphone/main.cxx new/opal-3.10.10/samples/openphone/main.cxx --- old/opal-3.10.9/samples/openphone/main.cxx 2012-11-26 11:49:18.000000000 +0100 +++ new/opal-3.10.10/samples/openphone/main.cxx 2013-02-20 03:18:55.000000000 +0100 @@ -24,9 +24,9 @@ * * Contributor(s): ______________________________________. * - * $Revision: 28582 $ + * $Revision: 28777 $ * $Author: rjongbloed $ - * $Date: 2012-11-26 01:33:53 -0600 (Mon, 26 Nov 2012) $ + * $Date: 2013-01-06 22:04:40 -0600 (Sun, 06 Jan 2013) $ */ //#ifdef __GNUG__ @@ -1255,7 +1255,7 @@ int count = m_speedDials->GetItemCount(); for (int i = 0; i < count; i++) { SpeedDialInfo * info = (SpeedDialInfo *)m_speedDials->GetItemData(i); - if (info != NULL && MonitorPresence(info->m_Presentity, info->m_Address, true)) + if (info != NULL && MonitorPresence(info->m_Presentity, info->m_Address, true) && m_speedDialDetail) m_speedDials->SetItem(i, e_StatusColumn, IconStatusNames[Icon_Unknown]); } #endif // OPAL_SIP diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/opal-3.10.9/samples/openphone/openphone.wxg new/opal-3.10.10/samples/openphone/openphone.wxg --- old/opal-3.10.9/samples/openphone/openphone.wxg 2012-11-26 11:49:18.000000000 +0100 +++ new/opal-3.10.10/samples/openphone/openphone.wxg 2013-02-20 03:18:55.000000000 +0100 @@ -5454,7 +5454,7 @@ </object> <object class="wxDialog" name="RegistrationDialog" base="EditDialog"> <style>wxDEFAULT_DIALOG_STYLE</style> - <title>Registration/Subscribtions Configuration</title> + <title>Registration/Subscriptions Configuration</title> <object class="wxBoxSizer" name="sizer_48" base="EditBoxSizer"> <orient>wxVERTICAL</orient> <object class="sizeritem"> @@ -5967,7 +5967,7 @@ </object> </object> <object class="IMDialog" name="IMDialog" base="EditDialog"> - <style>wxDEFAULT_DIALOG_STYLE</style> + <style>wxCAPTION|wxCLOSE_BOX|wxRESIZE_BORDER|wxMAXIMIZE_BOX|wxMINIMIZE_BOX</style> <title>IMDialog</title> <size>350, 200d</size> <object class="wxBoxSizer" name="sizer_90" base="EditBoxSizer"> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/opal-3.10.9/samples/openphone/openphone.xrc new/opal-3.10.10/samples/openphone/openphone.xrc --- old/opal-3.10.9/samples/openphone/openphone.xrc 2012-11-26 11:49:18.000000000 +0100 +++ new/opal-3.10.10/samples/openphone/openphone.xrc 2013-02-20 03:18:55.000000000 +0100 @@ -4,7 +4,7 @@ <resource version="2.3.0.1"> <object class="wxDialog" name="RegistrationDialog"> <style>wxDEFAULT_DIALOG_STYLE</style> - <title>Registration/Subscribtions Configuration</title> + <title>Registration/Subscriptions Configuration</title> <object class="wxBoxSizer"> <orient>wxVERTICAL</orient> <object class="sizeritem"> @@ -406,7 +406,7 @@ </object> </object> <object class="wxDialog" name="IMDialog" subclass="IMDialog"> - <style>wxDEFAULT_DIALOG_STYLE</style> + <style>wxCAPTION|wxCLOSE_BOX|wxRESIZE_BORDER|wxMAXIMIZE_BOX|wxMINIMIZE_BOX</style> <size>350, 200d</size> <title>IMDialog</title> <object class="wxBoxSizer"> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/opal-3.10.9/samples/playrtp/playrtp_2010.vcxproj new/opal-3.10.10/samples/playrtp/playrtp_2010.vcxproj --- old/opal-3.10.9/samples/playrtp/playrtp_2010.vcxproj 2012-11-26 11:49:15.000000000 +0100 +++ new/opal-3.10.10/samples/playrtp/playrtp_2010.vcxproj 2013-02-20 03:18:53.000000000 +0100 @@ -73,6 +73,7 @@ <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <WarningLevel>Level4</WarningLevel> <SuppressStartupBanner>true</SuppressStartupBanner> + <PrecompiledHeaderOutputFile>$(VS_PCH_DIR)$(IntDir)$(TargetName).pch</PrecompiledHeaderOutputFile> </ClCompile> <ResourceCompile> <PreprocessorDefinitions>NDEBUG;_AFXDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions> @@ -111,6 +112,7 @@ <WarningLevel>Level4</WarningLevel> <SuppressStartupBanner>true</SuppressStartupBanner> <DebugInformationFormat>EditAndContinue</DebugInformationFormat> + <PrecompiledHeaderOutputFile>$(VS_PCH_DIR)$(IntDir)$(TargetName).pch</PrecompiledHeaderOutputFile> </ClCompile> <ResourceCompile> <PreprocessorDefinitions>_DEBUG;_AFXDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/opal-3.10.9/samples/simple/simpleDLL_2010.vcxproj new/opal-3.10.10/samples/simple/simpleDLL_2010.vcxproj --- old/opal-3.10.9/samples/simple/simpleDLL_2010.vcxproj 2012-11-26 11:49:13.000000000 +0100 +++ new/opal-3.10.10/samples/simple/simpleDLL_2010.vcxproj 2013-02-20 03:18:51.000000000 +0100 @@ -86,6 +86,7 @@ <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;PTRACING=1;%(PreprocessorDefinitions)</PreprocessorDefinitions> <RuntimeTypeInfo>true</RuntimeTypeInfo> <PrecompiledHeaderFile>ptlib.h</PrecompiledHeaderFile> + <PrecompiledHeaderOutputFile>$(VS_PCH_DIR)$(IntDir)$(TargetName).pch</PrecompiledHeaderOutputFile> </ClCompile> <Link> <SubSystem>Console</SubSystem> @@ -102,6 +103,7 @@ <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;PTRACING=1;%(PreprocessorDefinitions)</PreprocessorDefinitions> <RuntimeTypeInfo>true</RuntimeTypeInfo> <PrecompiledHeaderFile>ptlib.h</PrecompiledHeaderFile> + <PrecompiledHeaderOutputFile>$(VS_PCH_DIR)$(IntDir)$(TargetName).pch</PrecompiledHeaderOutputFile> </ClCompile> <Link> <SubSystem>Console</SubSystem> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/opal-3.10.9/samples/simple/simple_2010.vcxproj new/opal-3.10.10/samples/simple/simple_2010.vcxproj --- old/opal-3.10.9/samples/simple/simple_2010.vcxproj 2012-11-26 11:49:13.000000000 +0100 +++ new/opal-3.10.10/samples/simple/simple_2010.vcxproj 2013-02-20 03:18:51.000000000 +0100 @@ -83,6 +83,7 @@ <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;PTRACING=1;%(PreprocessorDefinitions)</PreprocessorDefinitions> <RuntimeTypeInfo>true</RuntimeTypeInfo> <PrecompiledHeaderFile>ptlib.h</PrecompiledHeaderFile> + <PrecompiledHeaderOutputFile>$(VS_PCH_DIR)$(IntDir)$(TargetName).pch</PrecompiledHeaderOutputFile> </ClCompile> <Link> <SubSystem>Console</SubSystem> @@ -99,6 +100,7 @@ <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;PTRACING=1;%(PreprocessorDefinitions)</PreprocessorDefinitions> <RuntimeTypeInfo>true</RuntimeTypeInfo> <PrecompiledHeaderFile>ptlib.h</PrecompiledHeaderFile> + <PrecompiledHeaderOutputFile>$(VS_PCH_DIR)$(IntDir)$(TargetName).pch</PrecompiledHeaderOutputFile> </ClCompile> <Link> <SubSystem>Console</SubSystem> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/opal-3.10.9/src/codec/opalpluginmgr.cxx new/opal-3.10.10/src/codec/opalpluginmgr.cxx --- old/opal-3.10.9/src/codec/opalpluginmgr.cxx 2012-11-26 11:49:07.000000000 +0100 +++ new/opal-3.10.10/src/codec/opalpluginmgr.cxx 2013-02-20 03:18:46.000000000 +0100 @@ -24,9 +24,9 @@ * * Contributor(s): ______________________________________. * - * $Revision: 28134 $ + * $Revision: 29072 $ * $Author: rjongbloed $ - * $Date: 2012-08-01 19:48:35 -0500 (Wed, 01 Aug 2012) $ + * $Date: 2013-02-11 23:59:41 -0600 (Mon, 11 Feb 2013) $ */ #ifdef __GNUC__ @@ -1363,8 +1363,9 @@ if ((position = msg.Find('=', position)) != P_MAX_INDEX) { ++position; - statistics.m_fax.m_stationId = msg(position, msg.Find('\n', position)-1); - if ((position = msg.Find('=', position)) != P_MAX_INDEX) + PINDEX eol = msg.Find('\n', position); + statistics.m_fax.m_stationId = msg(position, eol-1); + if ((position = msg.Find('=', eol)) != P_MAX_INDEX) statistics.m_fax.m_phase = msg[++position]; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/opal-3.10.9/src/opal/call.cxx new/opal-3.10.10/src/opal/call.cxx --- old/opal-3.10.9/src/opal/call.cxx 2012-11-26 11:48:52.000000000 +0100 +++ new/opal-3.10.10/src/opal/call.cxx 2013-02-20 03:18:31.000000000 +0100 @@ -24,9 +24,9 @@ * * Contributor(s): ______________________________________. * - * $Revision: 27987 $ + * $Revision: 28690 $ * $Author: rjongbloed $ - * $Date: 2012-07-10 06:06:01 -0500 (Tue, 10 Jul 2012) $ + * $Date: 2012-12-18 20:47:15 -0600 (Tue, 18 Dec 2012) $ */ #include <ptlib.h> @@ -156,24 +156,28 @@ void OpalCall::InternalOnClear() { - if (connectionsActive.IsEmpty() && manager.activeCalls.Contains(GetToken())) { - OnCleared(); + if (!connectionsActive.IsEmpty()) + return; + + if (m_isCleared.TestAndSet(true)) + return; + + OnCleared(); #if OPAL_HAS_MIXER - StopRecording(); + StopRecording(); #endif - if (LockReadWrite()) { - while (!m_endCallSyncPoint.empty()) { - PTRACE(5, "Call\tSignalling end call."); - m_endCallSyncPoint.front()->Signal(); - m_endCallSyncPoint.pop_front(); - } - UnlockReadWrite(); + if (LockReadWrite()) { + while (!m_endCallSyncPoint.empty()) { + PTRACE(5, "Call\tSignalling end call."); + m_endCallSyncPoint.front()->Signal(); + m_endCallSyncPoint.pop_front(); } - - manager.activeCalls.RemoveAt(GetToken()); + UnlockReadWrite(); } + + manager.activeCalls.RemoveAt(GetToken()); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/opal-3.10.9/src/opal/transports.cxx new/opal-3.10.10/src/opal/transports.cxx --- old/opal-3.10.9/src/opal/transports.cxx 2012-11-26 11:48:52.000000000 +0100 +++ new/opal-3.10.10/src/opal/transports.cxx 2013-02-20 03:18:31.000000000 +0100 @@ -28,9 +28,9 @@ * US Joint Forces Command Joint Concept Development & Experimentation (J9) * http://www.jfcom.mil/about/abt_j9.htm * - * $Revision: 27884 $ + * $Revision: 28967 $ * $Author: rjongbloed $ - * $Date: 2012-06-24 19:43:04 -0500 (Sun, 24 Jun 2012) $ + * $Date: 2013-01-22 23:55:34 -0600 (Tue, 22 Jan 2013) $ */ #include <ptlib.h> @@ -1480,6 +1480,7 @@ } } + socket->SetInterface(PString::Empty()); return ok; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/opal-3.10.9/src/rtp/pcapfile.cxx new/opal-3.10.10/src/rtp/pcapfile.cxx --- old/opal-3.10.9/src/rtp/pcapfile.cxx 2012-11-26 11:49:04.000000000 +0100 +++ new/opal-3.10.10/src/rtp/pcapfile.cxx 2013-02-20 03:18:43.000000000 +0100 @@ -25,9 +25,9 @@ * * Contributor(s): ______________________________________. * - * $Revision: 26261 $ + * $Revision: 28601 $ * $Author: rjongbloed $ - * $Date: 2011-08-01 23:31:23 -0500 (Mon, 01 Aug 2011) $ + * $Date: 2012-11-26 18:45:27 -0600 (Mon, 26 Nov 2012) $ */ #include <ptlib.h> @@ -200,8 +200,14 @@ if (GetDataLink(ip) != 0x800) // IPv4 return -1; + PINDEX totalLength = (ip[2]<<8)|ip[3]; // Total length of packet + if (totalLength > ip.GetSize()) { + PTRACE(2, "Truncated IP packet, expected " << totalLength << ", got " << ip.GetSize()); + return -1; + } + PINDEX headerLength = (ip[0]&0xf)*4; // low 4 bits in DWORDS, is this in bytes - payload.Attach(&ip[headerLength], ip.GetSize()-headerLength); + payload.Attach(&ip[headerLength], totalLength-headerLength); m_packetSrcIP = PIPSocket::Address(4, ip+12); if (!m_filterSrcIP.IsAny() && m_filterSrcIP != m_packetSrcIP) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/opal-3.10.9/src/rtp/rtp.cxx new/opal-3.10.10/src/rtp/rtp.cxx --- old/opal-3.10.9/src/rtp/rtp.cxx 2012-11-26 11:49:04.000000000 +0100 +++ new/opal-3.10.10/src/rtp/rtp.cxx 2013-02-20 03:18:43.000000000 +0100 @@ -26,9 +26,9 @@ * * Contributor(s): ______________________________________. * - * $Revision: 28374 $ + * $Revision: 29118 $ * $Author: rjongbloed $ - * $Date: 2012-09-18 05:42:39 -0500 (Tue, 18 Sep 2012) $ + * $Date: 2013-02-15 20:10:30 -0600 (Fri, 15 Feb 2013) $ */ #include <ptlib.h> @@ -1180,10 +1180,8 @@ // As per RFC3550 Appendix 8 diff *= GetJitterTimeUnits(); // Convert to timestamp units - long variance = diff - lastTransitTime; + long variance = diff > lastTransitTime ? (diff - lastTransitTime) : (lastTransitTime - diff); lastTransitTime = diff; - if (variance < 0) - variance = -variance; jitterLevel += variance - ((jitterLevel+(1<<(JitterRoundingGuardBits-1))) >> JitterRoundingGuardBits); if (jitterLevel > maximumJitterLevel) maximumJitterLevel = jitterLevel; @@ -2281,6 +2279,11 @@ // Shouldn't happen, but it does. return RTP_Session::e_IgnorePacket; + case 0 : + PTRACE(4, "RTP_UDP\tSession " << sessionID << ", " << channelName + << " received UDP packet with no payload."); + return e_IgnorePacket; + default: PTRACE(1, "RTP_UDP\tSession " << sessionID << ", " << channelName << " read error (" << socket.GetErrorNumber(PChannel::LastReadError) << "): " diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/opal-3.10.9/src/sip/handlers.cxx new/opal-3.10.10/src/sip/handlers.cxx --- old/opal-3.10.9/src/sip/handlers.cxx 2012-11-26 11:48:53.000000000 +0100 +++ new/opal-3.10.10/src/sip/handlers.cxx 2013-02-20 03:18:32.000000000 +0100 @@ -23,9 +23,9 @@ * * Contributor(s): ______________________________________. * - * $Revision: 28428 $ + * $Revision: 29080 $ * $Author: rjongbloed $ - * $Date: 2012-10-01 03:38:50 -0500 (Mon, 01 Oct 2012) $ + * $Date: 2013-02-12 18:52:05 -0600 (Tue, 12 Feb 2013) $ * * This code implements all or part of the following RFCs * @@ -304,13 +304,12 @@ m_transport = NULL; } - if (m_proxy.IsEmpty()) { - // Look for a "proxy" parameter to override default proxy - const PStringToString & params = m_remoteAddress.GetParamVars(); - if (params.Contains(OPAL_PROXY_PARAM)) { - m_proxy.Parse(params(OPAL_PROXY_PARAM)); - m_remoteAddress.SetParamVar(OPAL_PROXY_PARAM, PString::Empty()); - } + const PStringToString & remoteParams = m_remoteAddress.GetParamVars(); + + // Look for a "proxy" parameter to override default proxy + if (m_proxy.IsEmpty() && remoteParams.Contains(OPAL_PROXY_PARAM)) { + m_proxy.Parse(remoteParams(OPAL_PROXY_PARAM)); + m_remoteAddress.SetParamVar(OPAL_PROXY_PARAM, PString::Empty()); } SIPURL url; @@ -321,8 +320,11 @@ url.AdjustToDNS(); } - // Must specify a network interface or get infinite recursion - m_transport = endpoint.CreateTransport(url, "*"); + PString localInterface = remoteParams(OPAL_INTERFACE_PARAM); + if (localInterface.IsEmpty()) + localInterface = "*"; // Must specify a network interface or get infinite recursion + + m_transport = endpoint.CreateTransport(url, localInterface); return m_transport; } @@ -408,15 +410,27 @@ m_transactions.Remove(&transaction); // Take this transaction out of list - // And kill all the rest - PSafePtr<SIPTransaction> transToGo; - while ((transToGo = m_transactions.GetAt(0)) != NULL) { - m_transactions.Remove(transToGo); - transToGo->Abort(); - } + switch (response.GetStatusCode()) { + default : + if (responseClass != 2) + break; - // Finally end connect mode on the transport - m_transport->SetInterface(transaction.GetInterface()); + case SIP_PDU::Failure_UnAuthorised : + case SIP_PDU::Failure_ProxyAuthenticationRequired : + case SIP_PDU::Failure_IntervalTooBrief : + case SIP_PDU::Failure_TemporarilyUnavailable: + // End connect mode on the transport + PString iface = transaction.GetInterface(); + PTRACE(4, "SIP\tFinalising handlers interface \"" << iface << '"'); + m_transport->SetInterface(iface); + + // And kill all the rest + PSafePtr<SIPTransaction> transToGo; + while ((transToGo = m_transactions.GetAt(0)) != NULL) { + m_transactions.Remove(transToGo); + transToGo->Abort(); + } + } switch (response.GetStatusCode()) { case SIP_PDU::Failure_UnAuthorised : @@ -716,6 +730,7 @@ for (SIPURLList::iterator reply = replyContacts.begin(); reply != replyContacts.end(); ) { if (reply->GetHostAddress() == externalAddress) { externalAddress.MakeEmpty(); // Clear this so no further action taken + m_externalAddress.MakeEmpty(); ++reply; } else if (std::find(requestedContacts.begin(), requestedContacts.end(), *reply) != requestedContacts.end()) @@ -749,27 +764,29 @@ return; } - // Remember (possibly new) NAT address - m_externalAddress == externalAddress; - if (GetExpire() == 0) { // If we had discovered we are behind NAT and had unregistered, re-REGISTER with new addresses - PTRACE(2, "SIP\tRe-registering with NAT address " << externalAddress); + PTRACE(2, "SIP\tRe-registering NAT address change (" << m_contactAddresses << ") to " << externalAddress); for (SIPURLList::iterator contact = m_contactAddresses.begin(); contact != m_contactAddresses.end(); ++contact) contact->SetHostAddress(externalAddress); + m_contactAddresses.unique(); SetExpire(m_originalExpireTime); } else { /* If we got here then we have done a successful register, but registrar indicated that we are behind firewall. Unregister what we just registered */ - PTRACE(2, "SIP\tRemote indicated change of REGISTER Contact header required due to NAT"); for (SIPURLList::iterator contact = replyContacts.begin(); contact != replyContacts.end(); ++contact) contact->GetFieldParameters().Remove("expires"); + PTRACE(2, "SIP\tRemote indicated change of REGISTER Contact address(s) (" << replyContacts + << ") required due to NAT address " << externalAddress << ", previous=" << m_externalAddress); m_contactAddresses = replyContacts; SetExpire(0); } - SendRequest(previousState); + // Remember (possibly new) NAT address + m_externalAddress == externalAddress; + + SendRequest(Refreshing); SendStatus(SIP_PDU::Information_Trying, previousState); } @@ -842,8 +859,11 @@ if (params.m_expire > 0) SetExpire(m_parameters.m_expire = params.m_expire); + m_parameters.m_compatibility = params.m_compatibility; m_parameters.m_contactAddress = params.m_contactAddress; m_contactAddresses.clear(); + + PTRACE(4, "SIP\tREGISTER parameters updated."); } @@ -1260,7 +1280,12 @@ PMIMEInfo info(request.GetEntityBody()); - PString account = info.Get("Message-Account", handler.GetAddressOfRecord().AsString()); + const SIPURL & aor = handler.GetAddressOfRecord(); + PString account = info.Get("Message-Account"); + SIPURL accountURI(account); + if (account.IsEmpty() || aor.GetUserName() == account || + (accountURI.GetUserName() == "asterisk" && accountURI.GetHostName() == aor.GetHostName())) + account = aor.AsString(); bool nothingSent = true; for (PINDEX z = 0 ; z < PARRAYSIZE(validMessageClasses); z++) { @@ -2086,15 +2111,16 @@ m_offlineExpireTime = 0; // No retries for offline, just give up + /* The "singleton" operation of the OPTION command is executed as though we + are unsubscribing from an existing subscription, so when completed the + handler is disposed of. So, we need to fake the subscribe state. */ SetState(Subscribed); + m_receivedResponse = true; } SIPTransaction * SIPOptionsHandler::CreateTransaction(OpalTransport & transport) { - if (GetState() == Unsubscribing) - return NULL; - return new SIPOptions(endpoint, transport, GetCallID(), m_parameters); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/opal-3.10.9/src/sip/sipcon.cxx new/opal-3.10.10/src/sip/sipcon.cxx --- old/opal-3.10.9/src/sip/sipcon.cxx 2012-11-26 11:48:53.000000000 +0100 +++ new/opal-3.10.10/src/sip/sipcon.cxx 2013-02-20 03:18:32.000000000 +0100 @@ -23,9 +23,9 @@ * * Contributor(s): ______________________________________. * - * $Revision: 28445 $ + * $Revision: 29086 $ * $Author: rjongbloed $ - * $Date: 2012-10-02 20:11:02 -0500 (Tue, 02 Oct 2012) $ + * $Date: 2013-02-13 14:48:06 -0600 (Wed, 13 Feb 2013) $ */ #include <ptlib.h> @@ -659,7 +659,7 @@ port is zero indicating the media is not to be used. So don't return these bogus media formats from SDP to the "remote media format list". */ m_remoteFormatList.Remove(PString('@')+mediaType); - return false; + return NULL; } OpalTransportAddress remoteMediaAddress = mediaDescription.GetTransportAddress(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/opal-3.10.9/src/sip/sipep.cxx new/opal-3.10.10/src/sip/sipep.cxx --- old/opal-3.10.9/src/sip/sipep.cxx 2012-11-26 11:48:53.000000000 +0100 +++ new/opal-3.10.10/src/sip/sipep.cxx 2013-02-20 03:18:32.000000000 +0100 @@ -23,9 +23,9 @@ * * Contributor(s): ______________________________________. * - * $Revision: 28428 $ + * $Revision: 29081 $ * $Author: rjongbloed $ - * $Date: 2012-10-01 03:38:50 -0500 (Mon, 01 Oct 2012) $ + * $Date: 2013-02-12 18:54:50 -0600 (Tue, 12 Feb 2013) $ */ #include <ptlib.h> @@ -223,12 +223,15 @@ GetManager().GetNatMethod(transport->GetRemoteAddress().GetHostName()) == NULL) continue; + PTRACE(4, "SIP\tNAT Binding refresh for " << handler->GetMethod() + << " to " << handler->GetAddressOfRecord() << ", id=" << handler->GetCallID()); switch (natMethod) { - case Options: { SIPOptions::Params params; + params.m_addressOfRecord = handler->GetAddressOfRecord(); params.m_remoteAddress = transport->GetRemoteAddress().GetHostName(); + params.m_interface = transport->GetInterface(); SendOPTIONS(params); } break; @@ -253,7 +256,7 @@ if (remoteAddress.IsEmpty()) { if (GetRegistrationsCount() == 0) { PTRACE(1, "SIP\tCannot use tel URI with phone-context or existing registration."); - return false; + return NULL; } remoteAddress = SIPURL(GetRegistrations()[0]).GetHostAddress(); } @@ -886,7 +889,7 @@ SIPConnection *connection = CreateConnection(*call, SIPURL::GenerateTag(), NULL, - SIPURL(), + mime.GetFrom(), newTransport, request); if (!AddConnection(connection)) { @@ -1506,7 +1509,7 @@ PSafePtr<SIPHandler> handler = new SIPOptionsHandler(*this, params); activeSIPHandlers.Append(handler); - return handler->ActivateState(SIPHandler::Subscribing); + return handler->ActivateState(SIPHandler::Unsubscribing); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/opal-3.10.9/src/sip/sippdu.cxx new/opal-3.10.10/src/sip/sippdu.cxx --- old/opal-3.10.9/src/sip/sippdu.cxx 2012-11-26 11:48:53.000000000 +0100 +++ new/opal-3.10.10/src/sip/sippdu.cxx 2013-02-20 03:18:32.000000000 +0100 @@ -23,9 +23,9 @@ * * Contributor(s): ______________________________________. * - * $Revision: 28110 $ + * $Revision: 29080 $ * $Author: rjongbloed $ - * $Date: 2012-07-30 21:08:09 -0500 (Mon, 30 Jul 2012) $ + * $Date: 2013-02-12 18:52:05 -0600 (Tue, 12 Feb 2013) $ */ #include <ptlib.h> @@ -691,8 +691,15 @@ PString SIPURLList::ToString() const { PStringStream strm; + strm << *this; + return strm; +} + + +ostream & operator<<(ostream & strm, const SIPURLList & urls) +{ bool outputCommas = false; - for (const_iterator it = begin(); it != end(); ++it) { + for (SIPURLList::const_iterator it = urls.begin(); it != urls.end(); ++it) { if (it->IsEmpty()) continue; @@ -1797,36 +1804,38 @@ } -PString SIP_PDU::CreateVia(SIPEndPoint & endpoint, const OpalTransport & transport, SIPConnection * connection) +PString SIP_PDU::CreateVia(SIPEndPoint & endpoint, const OpalTransport & transport) { - PString localPartyName; - - if (connection != NULL) { - localPartyName = connection->GetLocalPartyName(); + // construct Via + OpalTransportAddress via; - PINDEX pos = localPartyName.Find('@'); - if (pos != P_MAX_INDEX) - localPartyName = localPartyName.Left(pos); - - pos = localPartyName.Find(' '); - if (pos != P_MAX_INDEX) - localPartyName.Replace(" ", "_", true); + if (transport.IsOpen()) + via = transport.GetLocalAddress(); + else { + PTRACE(3, "SIP\tCannot use transport for via, picking first compatible listener"); + const OpalListenerList & listeners = endpoint.GetListeners(); + for (OpalListenerList::const_iterator listener = listeners.begin(); listener != listeners.end(); ++listener) { + OpalTransportAddress binding = listener->GetLocalAddress(); + if (transport.IsCompatibleTransport(binding)) { + via = binding; + break; + } + } } - OpalTransportAddress via = endpoint.GetLocalURL(transport, localPartyName).GetHostAddress(); - - // construct Via: PINDEX dollar = via.Find('$'); PStringStream str; str << "SIP/" << m_versionMajor << '.' << m_versionMinor << '/' << via.Left(dollar).ToUpper() << ' '; + PIPSocket::Address ip; WORD port = 5060; if (via.GetIpAndPort(ip, port)) str << ip.AsString(true) << ':' << port; else str << via.Mid(dollar+1); + str << ";branch=z9hG4bK" << OpalGloballyUniqueID() << ";rport"; return str; } @@ -2744,8 +2753,10 @@ m_state = Trying; m_retry = 0; - if (m_localInterface.IsEmpty()) + if (m_localInterface.IsEmpty()) { m_localInterface = m_transport.GetInterface(); + PTRACE(4, "SIP\tTransaction remembering interface \"" << m_localInterface << '"'); + } /* Get the address to which the request PDU should be sent, according to the RFC, for a request in a dialog. @@ -3160,6 +3171,9 @@ aor.SetParamVar(OPAL_LOCAL_ID_PARAM, m_localAddress); } + if (!m_interface.IsEmpty()) + server.SetParamVar(OPAL_INTERFACE_PARAM, m_interface); + m_remoteAddress = server.AsString(); m_addressOfRecord = aor.AsString(); @@ -3769,7 +3783,7 @@ SIPURL remoteAddress = params.m_remoteAddress; SIPURL localAddress = params.m_localAddress; if (localAddress.IsEmpty()) - localAddress = ep.GetRegisteredPartyName(remoteAddress.GetHostAddress(), trans); + localAddress = ep.GetRegisteredPartyName(remoteAddress, trans); localAddress.SetTag(); InitialiseHeaders(remoteAddress, remoteAddress, localAddress, id, ep.GetNextCSeq(), CreateVia(ep, trans)); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/opal-3.10.9/src/win32/opal_lib_2010.vcxproj new/opal-3.10.10/src/win32/opal_lib_2010.vcxproj --- old/opal-3.10.9/src/win32/opal_lib_2010.vcxproj 2012-11-26 11:49:03.000000000 +0100 +++ new/opal-3.10.10/src/win32/opal_lib_2010.vcxproj 2013-02-20 03:18:42.000000000 +0100 @@ -80,6 +80,7 @@ <RuntimeTypeInfo>true</RuntimeTypeInfo> <PrecompiledHeaderFile>ptlib.h</PrecompiledHeaderFile> <BrowseInformation>true</BrowseInformation> + <PrecompiledHeaderOutputFile>$(VS_PCH_DIR)$(IntDir)$(TargetName).pch</PrecompiledHeaderOutputFile> </ClCompile> <Link> <SubSystem>Windows</SubSystem> @@ -97,6 +98,7 @@ <AdditionalIncludeDirectories>..\..\include;..\..\..\ptlib\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <RuntimeTypeInfo>true</RuntimeTypeInfo> <PrecompiledHeaderFile>ptlib.h</PrecompiledHeaderFile> + <PrecompiledHeaderOutputFile>$(VS_PCH_DIR)$(IntDir)$(TargetName).pch</PrecompiledHeaderOutputFile> </ClCompile> <Link> <SubSystem>Windows</SubSystem> @@ -116,6 +118,7 @@ <AdditionalIncludeDirectories>..\..\include;..\..\..\ptlib\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <RuntimeTypeInfo>true</RuntimeTypeInfo> <PrecompiledHeaderFile>ptlib.h</PrecompiledHeaderFile> + <PrecompiledHeaderOutputFile>$(VS_PCH_DIR)$(IntDir)$(TargetName).pch</PrecompiledHeaderOutputFile> </ClCompile> <Link> <SubSystem>Windows</SubSystem> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/opal-3.10.9/version.h new/opal-3.10.10/version.h --- old/opal-3.10.9/version.h 2012-11-26 11:49:59.000000000 +0100 +++ new/opal-3.10.10/version.h 2013-02-20 03:18:59.000000000 +0100 @@ -37,7 +37,7 @@ #define MAJOR_VERSION 3 #define MINOR_VERSION 10 #define BUILD_TYPE ReleaseCode -#define BUILD_NUMBER 9 +#define BUILD_NUMBER 10 #endif // _OPAL_VERSION_H -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libX11 for openSUSE:Factory
by root＠hilbert.suse.de 26 Mar '13

26 Mar '13

Hello community, here is the log from the commit of package libX11 for openSUSE:Factory checked in at 2013-03-26 19:48:18 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libX11 (Old) and /work/SRC/openSUSE:Factory/.libX11.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libX11", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/libX11/libX11.changes 2013-03-01 07:26:14.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libX11.new/libX11.changes 2013-03-26 19:48:19.000000000 +0100 @@ -1,0 +2,20 @@ +Mon Mar 25 10:23:19 UTC 2013 - tobias.johannes.klausmann(a)mni.thm.de + +- Update to version 1.5.99.901 (1.6 RC1): + + Remove upstreamed patches: + bug153744.diff (patch1) + p_new-locales.diff (patch4) + p_khmer-locale.diff (patch8) + Xcms.diff (patch17) + compose-zh_CN.UTF-8.diff (patch18) + + Changed patches: + bug-239698_libx11.diff (patch10) + bug-221326-xim-sync.patch (patch13) + en-locales.diff (patch15) + +------------------------------------------------------------------- +Tue Mar 19 18:20:00 UTC 2013 - jengelh(a)inai.de + +- Use more robust make install call + +------------------------------------------------------------------- Old: ---- Xcms.diff bug153744.diff compose-zh_CN.UTF-8.diff libX11-1.5.0.tar.bz2 p_khmer-locale.diff p_new-locales.diff New: ---- libX11-1.5.99.901.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libX11.spec ++++++ --- /var/tmp/diff_new_pack.UmWMfJ/_old 2013-03-26 19:48:21.000000000 +0100 +++ /var/tmp/diff_new_pack.UmWMfJ/_new 2013-03-26 19:48:21.000000000 +0100 @@ -17,7 +17,7 @@ Name: libX11 -Version: 1.5.0 +Version: 1.5.99.901 Release: 0 Summary: Core X11 protocol client library License: MIT @@ -27,24 +27,14 @@ #Git-Clone: git://anongit.freedesktop.org/xorg/lib/libX11 #Git-Web: http://cgit.freedesktop.org/xorg/lib/libX11/ Source: %{name}-%{version}.tar.bz2 -# make legal department happy -Patch1: bug153744.diff -# PATCH-FIX-UPSTREAM p_new-locales.diff fdo#48594 bnc#98262 -- Add missing locale aliases for bn_IN gu_IN kn_IN pa_IN -Patch4: p_new-locales.diff # PATCH-FIX-UPSTREAM p_khmer-compose.diff fdo#48595 bnc#143348 -- required compose entries for Khmer Patch7: p_khmer-compose.diff -# PATCH-FIX-UPSTREAM p_khmer-compose.diff fdo#48595 bnc#143348 -- km_KH locale support -Patch8: p_khmer-locale.diff # PATCH-FEATURE-UPSTREAM p_xlib_skip_ext_env.diff fdo#48588 bnc#167317 -- Add support for disabling extensions through environment variables Patch9: p_xlib_skip_ext_env.diff Patch10: bug-239698_libx11.diff Patch13: bug-221326-xim-sync.patch # PATCH-FIX-UPSTREAM en-locales.diff fdo#48596 bnc#388711 -- Add missing data for more en locales Patch15: en-locales.diff -# PATCH-FIX-UPSTREAM Xcms.diff fdo#48590 bnc#419548 -- Install Xcms.txt in $(datadir) not $(libdir) -Patch17: Xcms.diff -# PATCH-FIX-UPSTREAM compose-zh_CN.UTF-8.diff fdo#48591 bnc#461243 -- Missing entry in compose.dir for zh_CN.UTF-8 -Patch18: compose-zh_CN.UTF-8.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: autoconf >= 2.60 @@ -107,7 +97,9 @@ %package data Summary: Shared data for the Core X11 protocol library Group: System/Libraries +%if 0%{?suse_version} >= 1130 BuildArch: noarch +%endif %description data The X Window System is a network-transparent window system that was @@ -147,9 +139,11 @@ test -f nls/ja.U90/XLC_LOCALE.pre && exit 1 test -f nls/ja.S90/XLC_LOCALE.pre && exit 1 # -%patch -P 1 -P 4 -P 7 -P 8 -P 9 -p0 -%patch -P 10 -P 13 -p1 -%patch -P 15 -P 17 -P 18 -p0 +%patch7 -p0 +%patch9 -p0 +%patch10 -p1 +%patch13 -p1 +%patch15 -p0 %build # Got patches which change auto*files @@ -160,7 +154,7 @@ make %{?_smp_mflags} %install -%makeinstall +make install DESTDIR="%buildroot" rm -f "%buildroot/%_libdir"/*.la # Some files are empty/missing for some UTF-8 locales @@ -177,7 +171,7 @@ done popd -# fdupes +# fdupes %buildroot/%_prefix %post -n libX11-6 -p /sbin/ldconfig ++++++ bug-221326-xim-sync.patch ++++++ --- /var/tmp/diff_new_pack.UmWMfJ/_old 2013-03-26 19:48:21.000000000 +0100 +++ /var/tmp/diff_new_pack.UmWMfJ/_new 2013-03-26 19:48:21.000000000 +0100 @@ -2,7 +2,7 @@ index cb30ac2..31e9150 100644 --- a/modules/im/ximcp/imDefIc.c +++ b/modules/im/ximcp/imDefIc.c -@@ -908,6 +908,30 @@ _XimProtoDestroyIC( +@@ -920,6 +930,30 @@ _XimProtoDestroyIC( return; } @@ -23,14 +23,14 @@ + * This is what the hack below is doing. + */ + -+Private void ++static void +BrokenSyncWithServer(XIC xic) +{ + CARD32 dummy; + XGetICValues(xic, XNFilterEvents, &dummy, NULL); +} + - Private void + static void _XimProtoSetFocus( XIC xic) @@ -938,7 +962,8 @@ #else ++++++ bug-239698_libx11.diff ++++++ --- /var/tmp/diff_new_pack.UmWMfJ/_old 2013-03-26 19:48:21.000000000 +0100 +++ /var/tmp/diff_new_pack.UmWMfJ/_new 2013-03-26 19:48:21.000000000 +0100 @@ -2,14 +2,6 @@ index aa1aaaf..b3b7a9f 100644 --- a/modules/im/ximcp/imDefLkup.c +++ b/modules/im/ximcp/imDefLkup.c -@@ -661,6 +662,7 @@ _XimProcCommit( - return True; - } - -+ - Private Bool - _XimCommitRecv( - Xim im, @@ -704,7 +706,9 @@ _XimCommitRecv( (void)_XimRespSyncReply(ic, flag); ++++++ en-locales.diff ++++++ --- /var/tmp/diff_new_pack.UmWMfJ/_old 2013-03-26 19:48:21.000000000 +0100 +++ /var/tmp/diff_new_pack.UmWMfJ/_new 2013-03-26 19:48:21.000000000 +0100 @@ -1,107 +1,11 @@ ---- nls/compose.dir.pre.orig 2009-04-08 02:05:06.000000000 +0200 -+++ nls/compose.dir.pre 2009-04-08 02:12:44.000000000 +0200 -@@ -280,17 +280,25 @@ - el_GR.UTF-8/Compose: el_CY.UTF-8 - el_GR.UTF-8/Compose: el_GR.UTF-8 - en_US.UTF-8/Compose: en_AU.UTF-8 -+en_US.UTF-8/Compose: en_BE.UTF-8 -+en_US.UTF-8/Compose: en_BW.UTF-8 - en_US.UTF-8/Compose: en_BZ.UTF-8 - en_US.UTF-8/Compose: en_CA.UTF-8 -+en_US.UTF-8/Compose: en_DK.UTF-8 - en_US.UTF-8/Compose: en_GB.UTF-8 -+en_US.UTF-8/Compose: en_HK.UTF-8 - en_US.UTF-8/Compose: en_IE.UTF-8 -+en_US.UTF-8/Compose: en_IN.UTF-8 - en_US.UTF-8/Compose: en_JM.UTF-8 - en_US.UTF-8/Compose: en_MT.UTF-8 - en_US.UTF-8/Compose: en_NZ.UTF-8 -+en_US.UTF-8/Compose: en_PH.UTF-8 -+en_US.UTF-8/Compose: en_SG.UTF-8 - en_US.UTF-8/Compose: en_TT.UTF-8 - en_US.UTF-8/Compose: en_UK.UTF-8 - en_US.UTF-8/Compose: en_US.UTF-8 - en_US.UTF-8/Compose: en_ZA.UTF-8 -+en_US.UTF-8/Compose: en_ZW.UTF-8 - en_US.UTF-8/Compose: eo_XX.UTF-8 - en_US.UTF-8/Compose: es_AR.UTF-8 - en_US.UTF-8/Compose: es_BO.UTF-8 --- ../libX11-1.1.4.orig//nls/locale.alias.pre 2008-05-09 15:11:32.000000000 +0000 +++ nls/locale.alias.pre 2008-05-09 15:38:41.000000000 +0000 -@@ -296,11 +296,13 @@ - en_BW: en_BW.ISO8859-1 - en_BW.iso88591: en_BW.ISO8859-1 - en_BW.ISO-8859-1: en_BW.ISO8859-1 -+en_BW.utf8: en_BW.UTF-8 - en_CA: en_CA.ISO8859-1 - en_CA.iso88591: en_CA.ISO8859-1 +@@ -309,7 +320,8 @@ en_CA.ISO-8859-1: en_CA.ISO8859-1 en_CA.ISO_8859-1: en_CA.ISO8859-1 en_CA.utf8: en_CA.UTF-8 +en_DK.utf8: en_DK.UTF-8 + en_DL.utf8: en_DL.UTF-8 en_GB: en_GB.ISO8859-1 en_GB.88591: en_GB.ISO8859-1 en_GB.88591.en: en_GB.ISO8859-1 -@@ -316,6 +318,7 @@ - en_HK: en_HK.ISO8859-1 - en_HK.iso88591: en_HK.ISO8859-1 - en_HK.ISO-8859-1: en_HK.ISO8859-1 -+en_HK.utf8: en_HK.UTF-8 - en_IE: en_IE.ISO8859-1 - en_IE.iso88591: en_IE.ISO8859-1 - en_IE.ISO-8859-1: en_IE.ISO8859-1 -@@ -326,6 +329,7 @@ - en_IE.UTF-8@euro: en_IE.UTF-8 - en_IE.utf8: en_IE.UTF-8 - en_IN: en_IN.ISO8859-1 -+en_IN.utf8: en_IN.UTF-8 - en_NZ: en_NZ.ISO8859-1 - en_NZ.iso88591: en_NZ.ISO8859-1 - en_NZ.ISO-8859-1: en_NZ.ISO8859-1 -@@ -333,9 +337,11 @@ - en_PH: en_PH.ISO8859-1 - en_PH.iso88591: en_PH.ISO8859-1 - en_PH.ISO-8859-1: en_PH.ISO8859-1 -+en_PH.utf8: en_PH.UTF-8 - en_SG: en_SG.ISO8859-1 - en_SG.iso88591: en_SG.ISO8859-1 - en_SG.ISO-8859-1: en_SG.ISO8859-1 -+en_SG.utf8: en_SG.UTF-8 - en_US: en_US.ISO8859-1 - EN_US: en_US.ISO8859-1 - en_US.88591: en_US.ISO8859-1 -@@ -370,6 +376,7 @@ - en_ZW: en_ZW.ISO8859-1 - en_ZW.iso88591: en_ZW.ISO8859-1 - en_ZW.ISO-8859-1: en_ZW.ISO8859-1 -+en_ZW.utf8: en_ZW.UTF-8 - eo: eo_XX.ISO8859-3 - eo_EO: eo_EO.ISO8859-3 - eo_EO.ISO8859-3: eo_EO.ISO8859-3 ---- nls/locale.dir.pre.orig 2009-04-08 02:05:06.000000000 +0200 -+++ nls/locale.dir.pre 2009-04-08 02:16:54.000000000 +0200 -@@ -301,17 +301,24 @@ - en_US.UTF-8/XLC_LOCALE: el_GR.UTF-8 - en_US.UTF-8/XLC_LOCALE: en_AU.UTF-8 - en_US.UTF-8/XLC_LOCALE: en_BE.UTF-8 -+en_US.UTF-8/XLC_LOCALE: en_BW.UTF-8 - en_US.UTF-8/XLC_LOCALE: en_BZ.UTF-8 - en_US.UTF-8/XLC_LOCALE: en_CA.UTF-8 -+en_US.UTF-8/XLC_LOCALE: en_DK.UTF-8 - en_US.UTF-8/XLC_LOCALE: en_GB.UTF-8 -+en_US.UTF-8/XLC_LOCALE: en_HK.UTF-8 - en_US.UTF-8/XLC_LOCALE: en_IE.UTF-8 -+en_US.UTF-8/XLC_LOCALE: en_IN.UTF-8 - en_US.UTF-8/XLC_LOCALE: en_JM.UTF-8 - en_US.UTF-8/XLC_LOCALE: en_MT.UTF-8 - en_US.UTF-8/XLC_LOCALE: en_NZ.UTF-8 -+en_US.UTF-8/XLC_LOCALE: en_PH.UTF-8 -+en_US.UTF-8/XLC_LOCALE: en_SG.UTF-8 - en_US.UTF-8/XLC_LOCALE: en_TT.UTF-8 - en_US.UTF-8/XLC_LOCALE: en_UK.UTF-8 - en_US.UTF-8/XLC_LOCALE: en_US.UTF-8 - en_US.UTF-8/XLC_LOCALE: en_ZA.UTF-8 -+en_US.UTF-8/XLC_LOCALE: en_ZW.UTF-8 - en_US.UTF-8/XLC_LOCALE: eo_EO.UTF-8 - en_US.UTF-8/XLC_LOCALE: eo_XX.UTF-8 - en_US.UTF-8/XLC_LOCALE: es_AR.UTF-8 ++++++ libX11-1.5.0.tar.bz2 -> libX11-1.5.99.901.tar.bz2 ++++++ ++++ 107803 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 ksh for openSUSE:Factory
by root＠hilbert.suse.de 26 Mar '13

26 Mar '13

Hello community, here is the log from the commit of package ksh for openSUSE:Factory checked in at 2013-03-26 19:48:08 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ksh (Old) and /work/SRC/openSUSE:Factory/.ksh.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ksh", Maintainer is "werner(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/ksh/ksh.changes 2013-03-01 07:23:47.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.ksh.new/ksh.changes 2013-03-26 19:48:09.000000000 +0100 @@ -1,0 +2,14 @@ +Tue Mar 19 16:48:37 UTC 2013 - werner(a)suse.de + +- Add patch ksh93-typedef.dif as found during debugging + +------------------------------------------------------------------- +Tue Mar 19 15:14:00 UTC 2013 - werner(a)suse.de + +- Make Shift_JIS patch more reliable as requestef from upstream +- Drop remaining part of the patch ksh93-zerofill.dif for zerofilled + variables (bnc#785360 as the first part of the patch is upstream + together with an other change. This fix a side effect of cutting + variables if TMOUT is used (bnc#808956) + +------------------------------------------------------------------- Old: ---- ksh93-zerofill.dif New: ---- ksh93-typedef.dif ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ksh.spec ++++++ --- /var/tmp/diff_new_pack.gt1ThX/_old 2013-03-26 19:48:11.000000000 +0100 +++ /var/tmp/diff_new_pack.gt1ThX/_new 2013-03-26 19:48:11.000000000 +0100 @@ -114,8 +114,8 @@ Patch27: astksh_builtin_poll20120806_001.diff # PATCH-FIX-UPSTREAM ksh93-env.dif [bnc#785266, bnc#803613] Patch28: ksh93-env.dif -# PATCH-FIX-UPSTREAM ksh93-zerofill.dif [bnc#785360] -Patch29: ksh93-zerofill.dif +# PATCH-FIX-UPSTREAM ksh93-typedef.dif +Patch29: ksh93-typedef.dif # PATCH-EXTEND-UPSTREAM ksh93-pathtemp.dif [bnc#786134] # the fix is part of ksh93u+ 2012-06-28 # nevertheless the /dev/shm extension is useful @@ -389,7 +389,7 @@ fi done MEMORY="-s 128 ${MEMORY:+-e ${MEMORY}}" - RPM_OPT_FLAGS=$(echo "${RPM_OPT_FLAGS}"|sed -r 's/[[:blank:]]+-g[0-9]?/ -g2/g') + RPM_OPT_FLAGS=$(echo "${RPM_OPT_FLAGS}"|sed -r 's/([[:blank:]]+)-g[[:digit:]]+/\1-g2/g;s/([[:blank:]]+)-g([[:blank:]]+|$)/\1-g2\2/g') UNIVERSE=att LDFLAGS="-lm" LDSOFLG="" ++++++ ksh93-shift_ijs.dif ++++++ --- /var/tmp/diff_new_pack.gt1ThX/_old 2013-03-26 19:48:11.000000000 +0100 +++ /var/tmp/diff_new_pack.gt1ThX/_new 2013-03-26 19:48:11.000000000 +0100 @@ -116,7 +116,7 @@ else { --- src/cmd/ksh93/sh/macro.c -+++ src/cmd/ksh93/sh/macro.c 2013-02-07 13:26:07.897952986 +0000 ++++ src/cmd/ksh93/sh/macro.c 2013-03-19 17:16:46.062074381 +0100 @@ -54,6 +54,7 @@ #if SHOPT_MULTIBYTE # undef isascii @@ -125,7 +125,7 @@ #else # define mbchar(p) (*(unsigned char*)p++) #endif /* SHOPT_MULTIBYTE */ -@@ -2026,6 +2027,10 @@ static void comsubst(Mac_t *mp,register +@@ -2026,6 +2027,11 @@ static void comsubst(Mac_t *mp,register struct _mac_ savemac; int savtop = stktell(stkp); char lastc=0, *savptr = stkfreeze(stkp,0); @@ -133,33 +133,46 @@ + const Lc_t *lc=lcinfo(LC_CTYPE)->lc; + wchar_t lastw=0; +#endif /* SHOPT_MULTIBYTE */ ++ ssize_t len; int was_history = sh_isstate(SH_HISTORY); int was_verbose = sh_isstate(SH_VERBOSE); int was_interactive = sh_isstate(SH_INTERACTIVE); -@@ -2209,6 +2214,17 @@ static void comsubst(Mac_t *mp,register +@@ -2127,7 +2133,7 @@ static void comsubst(Mac_t *mp,register + num = lseek(fd, (off_t)0, SEEK_CUR); + goto out_offset; + } +- if(!(sp=mp->shp->sftable[fd])) ++ if(!(sp=mp->shp->sftable[fd]) || (sffileno(sp)!=fd &&!(sfset(sp,0,0)&SF_STRING))) + sp = sfnew(NIL(Sfio_t*),(char*)malloc(IOBSIZE+1),IOBSIZE,fd,SF_READ|SF_MALLOC); + type = 3; + } +@@ -2209,17 +2215,36 @@ static void comsubst(Mac_t *mp,register } else if(lastc) { +- mac_copy(mp,&lastc,1); ++ char mb[8]; ++ mb[0] = lastc; ++ len = 1; +#if SHOPT_MULTIBYTE + if(lastw) -+ { -+ int n; -+ char mb[8]; -+ n = mbconv(mb, lastw); -+ mac_copy(mp,mb,n); -+ lastw = 0; -+ } -+ else ++ len = mbconv(mb, lastw); ++ lastw = 0; +#endif /* SHOPT_MULTIBYTE */ - mac_copy(mp,&lastc,1); lastc = 0; ++ mac_copy(mp,mb,len); } -@@ -2220,6 +2236,17 @@ static void comsubst(Mac_t *mp,register - ssize_t len = 1; + newlines = nextnewlines; + if(++c < bufsize) + str[c] = 0; + else + { +- ssize_t len = 1; ++ len = 1; /* can't write past buffer so save last character */ +#if SHOPT_MULTIBYTE -+ if ((len = mbsize(str))>1 && !(lc->flags & LC_utf8)) ++ if ((lc->flags & LC_utf8)==0 && (len = mbsize(str))>1) + { + len = mb2wc(lastw,str,len); + if (len < 0) @@ -172,25 +185,25 @@ c -= len; lastc = str[c]; str[c] = 0; -@@ -2240,6 +2267,17 @@ static void comsubst(Mac_t *mp,register +@@ -2240,8 +2265,16 @@ static void comsubst(Mac_t *mp,register } if(lastc) { +- mac_copy(mp,&lastc,1); ++ char mb[8]; ++ mb[0] = lastc; ++ len = 1; +#if SHOPT_MULTIBYTE + if(lastw) -+ { -+ int n; -+ char mb[8]; -+ n = mbconv(mb, lastw); -+ mac_copy(mp,mb,n); -+ lastw = 0; -+ } -+ else ++ len = mbconv(mb, lastw); ++ lastw = 0; +#endif /* SHOPT_MULTIBYTE */ - mac_copy(mp,&lastc,1); lastc = 0; ++ mac_copy(mp,mb,len); } -@@ -2340,13 +2378,13 @@ static void mac_copy(register Mac_t *mp, + sfclose(sp); + return; +@@ -2340,13 +2373,13 @@ static void mac_copy(register Mac_t *mp, if(mp->pattern) { char *sp = "&|()"; @@ -228,7 +241,7 @@ int len; --- src/cmd/ksh93/tests/sjis.sh +++ src/cmd/ksh93/tests/sjis.sh 2011-05-20 15:11:29.000000000 +0000 -@@ -0,0 +1,67 @@ +@@ -0,0 +1,77 @@ +######################################################################## +# # +# Copyright (c) 2007 SuSE Linux Products GmbH, Nuernberg, Germany # @@ -295,6 +308,16 @@ + print -u2 -n "\t" + print -u2 -r ${0##*/}[$LINENO]: "Shift-JIS encoding failed" +fi ++ ++LANG=POSIX ++typeset -r utf8_euro_char1=$'\u[20ac]' ++typeset -r utf8_euro_char2=$'\342\202\254' ++(( (${#utf8_euro_char1} == 1) && (${#utf8_euro_char2} == 1) )) || export LC_ALL='en_US.UTF-8' ++if [[ "$(printf '\u[20ac]')" != $'\342\202\254' ]] ; then ++ : err_exit ++ print -u2 -n "\t" ++ print -u2 -r ${0##*/}[$LINENO]: "Locale overrride failed." ++fi +exit $err --- src/lib/libast/comp/setlocale.c +++ src/lib/libast/comp/setlocale.c 2007-12-20 17:50:28.000000000 +0000 ++++++ ksh93-typedef.dif ++++++ --- src/cmd/ksh93/bltins/typeset.c +++ src/cmd/ksh93/bltins/typeset.c 2013-03-19 17:21:08.667413362 +0100 @@ -461,6 +461,7 @@ static void print_value(Sfio_t *iop, Nam { char *name; int aflag=tp->aflag; + Namval_t *table; if(nv_isnull(np)) { if(!np->nvflag) @@ -504,7 +505,9 @@ static void print_value(Sfio_t *iop, Nam sfwrite(iop,"}\n",2); return; } + table = tp->sh->last_table; sfputr(iop,nv_name(np),aflag=='+'?'\n':'='); + tp->sh->last_table = table; if(aflag=='+') return; if(nv_isarray(np) && nv_arrayptr(np)) @@ -675,6 +678,7 @@ static int setall(char **argv,regist { if(comvar || (shp->last_root==shp->var_tree && (tp->tp || (!shp->st.real_fun && (nvflags&NV_STATIC)) || (!(flag&(NV_EXPORT|NV_RDONLY)) && nv_isattr(np,(NV_EXPORT|NV_IMPORT))==(NV_EXPORT|NV_IMPORT))))) { + if((flag&(NV_HOST|NV_INTEGER))!=NV_HOST) _nv_unset(np,0); } } @@ -790,7 +794,7 @@ static int setall(char **argv,regist else { char *oldname=0; - int len=strlen(name); + size_t len=strlen(name); if(tp->argnum==1 && newflag==NV_INTEGER && nv_isattr(np,NV_INTEGER)) tp->argnum = 10; if(np->nvfun && !nv_isarray(np) && name[len-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 geda-gaf for openSUSE:Factory
by root＠hilbert.suse.de 26 Mar '13

26 Mar '13

Hello community, here is the log from the commit of package geda-gaf for openSUSE:Factory checked in at 2013-03-26 19:47:55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/geda-gaf (Old) and /work/SRC/openSUSE:Factory/.geda-gaf.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "geda-gaf", Maintainer is "" Changes: -------- New Changes file: --- /dev/null 2013-02-26 18:15:11.936010755 +0100 +++ /work/SRC/openSUSE:Factory/.geda-gaf.new/geda-gaf.changes 2013-03-26 19:47:56.000000000 +0100 @@ -0,0 +1,63 @@ +------------------------------------------------------------------- +Fri Jan 4 09:37:59 UTC 2013 - dmitry_r(a)opensuse.org + +- Change documentation license to GFDL-1.2 +- Add geda-gaf package for consolidation of installation + +------------------------------------------------------------------- +Thu Dec 27 07:35:46 UTC 2012 - dmitry_r(a)opensuse.org + +- Delete "guile" from requires +- Delete compitation time from binary + * grenum-no-build-time.patch +- Enable post build tests +- Split libgeda data to separate package + +------------------------------------------------------------------- +Mon Dec 24 10:12:51 UTC 2012 - dmitry_r(a)opensuse.org + +- Update to version 1.8.1 + * 'gschem' and 'gnetlist' have updated and rewritten user guides. + * All tools now give more informative error messages if they are + unable to load schematic or symbol files due to syntax errors. + * All tools now correctly handle schematic and symbol files with + '\r', '\n', or '\r\n' line endings, or a mixture. + * Unconnected pin ends and net ends are now all drawn with the + same box marker in `gschem' and printed output. + * Net segments with at least two connections (including indirect + connections via `netname=' attributes) are now drawn with + arrowheads rather than box markers on dangling ends in 'gschem' + and printed output. +- Set correct path to documentation + * gschem-doc-path.patch + +------------------------------------------------------------------- +Fri Aug 31 11:10:33 UTC 2012 - scorot(a)free.fr + +- fix build for 12.2 with patch0 + +------------------------------------------------------------------- +Tue Dec 27 10:13:57 UTC 2011 - werner.ho(a)gmx.de + +- updated to unstable version 1.7.1 +- fixes BUG #738587 + +------------------------------------------------------------------- +Sun Nov 20 17:22:59 UTC 2011 - werner.ho(a)gmx.de + +- linker flag fix (-lm) for openSuSE 12.1 + +------------------------------------------------------------------- +Sun Jan 16 00:00:00 UTC 2011 - werner.ho(a)gmx.de + +- new version 1.6.2 + +------------------------------------------------------------------- +Fri Feb 26 00:00:00 UTC 2010 - werner.ho(a)gmx.de + +- new version 1.6.1 + +------------------------------------------------------------------- +Mon Oct 10 00:00:00 UTC 2009 - werner.ho(a)gmx.de + +- first build of unified geda-gaf package version 1.6.0 New: ---- geda-gaf-1.8.1.tar.gz geda-gaf-rpmlintrc geda-gaf.changes geda-gaf.spec grenum-no-build-time.patch gschem-doc-path.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ geda-gaf.spec ++++++ # # spec file for package geda-gaf # # Copyright (c) 2013 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 # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # Please submit bugfixes or comments via http://bugs.opensuse.org/ # Name: geda-gaf Version: 1.8.1 %define libgeda_major 42 Release: 0 License: GPL-2.0+ Summary: Electronic Design Automation Toolsuite Url: http://geda-project.org/ Group: Productivity/Scientific/Electronics Source0: http://ftp.geda-project.org/geda-gaf/stable/v1.8/%{version}/%{name}-%{versi… # PATCH-FIX-OPENSUSE gschem-doc-path.patch -- set correct path to documentation Patch0: gschem-doc-path.patch # PATCH-FIX-OPENSUSE grenum-no-build-time.patch -- fix "W: file-contains-date-and-time" Patch1: grenum-no-build-time.patch BuildRequires: bison BuildRequires: cairo-devel BuildRequires: doxygen BuildRequires: fdupes BuildRequires: flex BuildRequires: gdk-pixbuf-devel BuildRequires: gettext-tools BuildRequires: groff BuildRequires: gtk2-devel BuildRequires: guile-devel BuildRequires: intltool BuildRequires: libstroke-devel BuildRequires: perl-XML-Parser BuildRequires: pkg-config BuildRequires: transfig BuildRequires: shared-mime-info BuildRequires: update-desktop-files BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: geda-gattrib = %{version} Requires: geda-gnetlist = %{version} Requires: geda-gschem = %{version} Requires: geda-gsymcheck = %{version} Requires: geda-symbols = %{version} Requires: geda-utils = %{version} Requires: geda-xgsch2pcb Requires: pcb Recommends: geda-doc Recommends: geda-examples %description The GPL Electronic Design Automation (gEDA) project has produced and continues working on a full GPL'd suite and toolkit of Electronic Design Automation tools. These tools are used for electrical circuit design, schematic capture, simulation, prototyping, and production. Currently, the gEDA project offers a mature suite of free software applications for electronics design, including schematic capture, attribute management, bill of materials (BOM) generation, netlisting into over 20 netlist formats, analog and digital simulation, and printed circuit board (PCB) layout. %package -n libgeda%{libgeda_major} Summary: Basic Library that is used by several gEDA programs Group: System/Libraries Requires: libgeda%{libgeda_major}-data %description -n libgeda%{libgeda_major} This package provides the basic library for several gEDA programs. The gEDA project is working on producing a full GPL'd suite of Electronic Design Automation tools. These tools are used for electrical circuit design, schematic capture, simulation, prototyping, and production. %package -n libgeda%{libgeda_major}-data Summary: Data for basic Library that is used by several gEDA programs Group: Productivity/Scientific/Electronics Requires(post): shared-mime-info Requires(postun): shared-mime-info %if 0%{?suse_version} > 1110 BuildArch: noarch %endif %description -n libgeda%{libgeda_major}-data This package provides the basic library for several gEDA programs. The gEDA project is working on producing a full GPL'd suite of Electronic Design Automation tools. These tools are used for electrical circuit design, schematic capture, simulation, prototyping, and production. %package -n libgeda-devel Summary: Basic Library that is Used by Several gEDA Programs Group: Development/Libraries/C and C++ # Requires: freetype2-devel Requires: glib2-devel Requires: gtk2-devel Requires: guile-devel Requires: libgeda%{libgeda_major} = %{version} Requires: libjpeg-devel Requires: libpng-devel %description -n libgeda-devel This package provides the basic library for several gEDA programs. The gEDA project is working on producing a full GPL'd suite of Electronic Design Automation tools. These tools are used for electrical circuit design, schematic capture, simulation, prototyping, and production. %package -n geda-doc Summary: Documentation Files for the gEDA Suite Group: Documentation/Other License: GFDL-1.2 %if 0%{?suse_version} > 1110 BuildArch: noarch %endif %description -n geda-doc This package contains the documentation of the gEDA suite. The documentation is a snapshot of the gEDA wiki located at http://wiki.geda-project.org/. %package -n geda-examples Summary: Some Example Files for the gEDA suite Group: Documentation/Other Requires: geda-symbols = %{version} %if 0%{?suse_version} > 1110 BuildArch: noarch %endif %description -n geda-examples Package with four nice example projects realized with gEDA. %package -n geda-gattrib Summary: Symbol and Schematic Attribute Editor of the gEDA Suite Group: Productivity/Scientific/Electronics Requires: geda-symbols = %{version} Requires: libgeda%{libgeda_major} = %{version} %description -n geda-gattrib With gattrib you can edit attributes of schematic or symbol files. It has a spreadsheet like GUI. gattrib is part of the gEDA suite. %package -n geda-gnetlist Summary: Schematic Netlist Generator Program of the gEDA Suite Group: Productivity/Scientific/Electronics Requires: geda-symbols = %{version} Requires: libgeda%{libgeda_major} = %{version} %description -n geda-gnetlist gnetlist is the netlist generator program of the gEDA suite. It reads schematic files and converts them into different connecitity netlists. gnetlist has several backends to generate netlists for pcb, spice, vhdl, verilog and many other programs. %package -n geda-gschem Summary: Schematic Capture Program of the gEDA Suite Group: Productivity/Scientific/Electronics Requires: geda-symbols = %{version} Requires: libgeda%{libgeda_major} = %{version} Recommends: geda-doc %description -n geda-gschem gschem is the schematic capture program of the gEDA suite. You can draw schematics for simulation, pcb production or documentation. With gschem you can draw hierarchical schematics. %package -n geda-gsymcheck Summary: Schematic Symbol Checker Program of the gEDA Suite Group: Productivity/Scientific/Electronics Requires: geda-symbols = %{version} Requires: libgeda%{libgeda_major} = %{version} %description -n geda-gsymcheck gsymcheck is a symbol checker of the gEDA suite. It checks symbols for missing or duplicate pins, missing attributes and definitions. %package -n geda-symbols Summary: Schematic Symbols for the gEDA Suite Group: Productivity/Scientific/Electronics %if 0%{?suse_version} > 1110 BuildArch: noarch %endif %description -n geda-symbols Package with schematic symbols for the gEDA suite %package -n geda-utils Summary: Various Utilities and Scripts for the gEDA Suite Group: Productivity/Scientific/Electronics Requires: geda-symbols = %{version} Requires: libgeda%{libgeda_major} = %{version} %description -n geda-utils This utility package contains several helper utilities for the gEDA suite. An advanced pcb netlister gsch2pcb, symbol converters and creators, refdes renumbering tools and many others. %prep %setup -q %patch0 -p1 %patch1 -p1 %build # export LDFLAGS="-lm $LDFLAGS" %configure \ --docdir=%{_docdir}/%{name} \ --disable-static \ --disable-rpath \ --disable-update-xdg-database make %{?_smp_mflags} %install %makeinstall find %{buildroot}%{_libdir} -name '*.la' -type f -delete -print %suse_update_desktop_file geda-gschem Education Science Electronics %suse_update_desktop_file geda-gattrib Education Science Electronics %fdupes -s %{buildroot}%{_docdir}/geda-gaf/examples %fdupes -s %{buildroot}%{_docdir}/geda-gaf/wiki %find_lang geda-gattrib %find_lang geda-gschem %find_lang libgeda%{libgeda_major} install -Dm 644 {AUTHORS,ChangeLog,COPYING,README,NEWS} %{buildroot}%{_docdir}/%{name}/ %check make check %clean rm -rf %{buildroot} %post -n libgeda%{libgeda_major} -p /sbin/ldconfig %postun -n libgeda%{libgeda_major} -p /sbin/ldconfig %post -n libgeda%{libgeda_major}-data %install_info --info-dir=%{_infodir} %{_infodir}/geda-scheme.info.gz /usr/bin/update-mime-database %{_datadir}/mime &> /dev/null || : %postun -n libgeda%{libgeda_major}-data %install_info_delete --info-dir=%{_infodir} %{_infodir}/geda-scheme.info.gz /usr/bin/update-mime-database %{_datadir}/mime &> /dev/null || : %files %defattr(-,root,root) %doc %{_docdir}/%{name}/AUTHORS %doc %{_docdir}/%{name}/ChangeLog %doc %{_docdir}/%{name}/COPYING %doc %{_docdir}/%{name}/README %doc %{_docdir}/%{name}/NEWS %files -n libgeda%{libgeda_major} %defattr(-,root,root) %{_libdir}/libgeda.so.%{libgeda_major}* %files -n libgeda%{libgeda_major}-data -f libgeda%{libgeda_major}.lang %defattr(-,root,root) %dir %{_datadir}/gEDA %dir %{_datadir}/gEDA/scheme %{_datadir}/gEDA/gafrc.d %{_datadir}/gEDA/system-gafrc %{_datadir}/gEDA/prolog.ps %{_datadir}/gEDA/print-colormap-lightbg %{_datadir}/gEDA/print-colormap-darkbg %{_datadir}/gEDA/scheme/geda.scm %{_datadir}/gEDA/scheme/color-map.scm %{_datadir}/icons/hicolor/*/mimetypes/* %{_datadir}/mime/packages/libgeda.xml %{_infodir}/geda-scheme.info.gz %files -n libgeda-devel %defattr(-,root,root) %{_includedir}/libgeda/ %{_libdir}/libgeda.so %{_libdir}/pkgconfig/libgeda.pc %files -n geda-doc %defattr(-,root,root) %dir %{_docdir}/%{name} %doc %{_docdir}/%{name}/gedadocs.html %doc %{_docdir}/%{name}/nc.pdf %doc %{_docdir}/%{name}/man/ %doc %{_docdir}/%{name}/readmes/ %doc %{_docdir}/%{name}/wiki/ %files -n geda-examples %defattr(-,root,root) %dir %{_docdir}/%{name} %{_docdir}/%{name}/examples/ %files -n geda-gattrib -f geda-gattrib.lang %defattr(-,root,root) %{_bindir}/gattrib %{_datadir}/gEDA/system-gattribrc %{_datadir}/gEDA/gattrib-menus.xml %{_datadir}/icons/hicolor/*/apps/geda-gattrib.* %{_datadir}/applications/geda-gattrib.desktop %{_mandir}/man1/gattrib.1.gz %files -n geda-gnetlist %defattr(-,root,root) %{_bindir}/gnetlist %{_datadir}/gEDA/scheme/gnetlist %{_datadir}/gEDA/system-gnetlistrc %{_datadir}/gEDA/scheme/gnet-*.scm %{_datadir}/gEDA/scheme/gnetlist-post.scm %{_datadir}/gEDA/scheme/gnetlist.scm %{_datadir}/gEDA/scheme/partslist-common.scm %{_mandir}/man1/gnetlist.1.gz %files -n geda-gschem -f geda-gschem.lang %defattr(-,root,root) %dir %{_datadir}/gEDA/scheme/geda %dir %{_datadir}/gEDA/scheme/geda/core %dir %{_datadir}/gEDA/scheme/gschem %dir %{_datadir}/gEDA/scheme/gschem/core %{_bindir}/gschem %{_datadir}/gEDA/system-gschemrc %{_datadir}/gEDA/gschem-gtkrc %{_datadir}/gEDA/gschem-colormap-darkbg %{_datadir}/gEDA/gschem-colormap-lightbg %{_datadir}/gEDA/gschem-colormap-bw %{_datadir}/gEDA/scheme/pcb.scm %{_datadir}/gEDA/scheme/auto-uref.scm %{_datadir}/gEDA/scheme/gschem.scm %{_datadir}/gEDA/scheme/auto-place-attribs.scm %{_datadir}/gEDA/scheme/print.scm %{_datadir}/gEDA/scheme/default-attrib-positions.scm %{_datadir}/gEDA/scheme/generate_netlist.scm %{_datadir}/gEDA/scheme/image.scm %{_datadir}/gEDA/scheme/list-keys.scm %{_datadir}/gEDA/scheme/print-NB-attribs.scm %{_datadir}/gEDA/scheme/geda/attrib.scm %{_datadir}/gEDA/scheme/geda/deprecated.scm %{_datadir}/gEDA/scheme/geda/object.scm %{_datadir}/gEDA/scheme/geda/os.scm %{_datadir}/gEDA/scheme/geda/page.scm %{_datadir}/gEDA/scheme/geda/core/gettext.scm %{_datadir}/gEDA/scheme/gschem/attrib.scm %{_datadir}/gEDA/scheme/gschem/core/gettext.scm %{_datadir}/gEDA/scheme/gschem/deprecated.scm %{_datadir}/gEDA/scheme/gschem/gschemdoc.scm %{_datadir}/gEDA/scheme/gschem/hook.scm %{_datadir}/gEDA/scheme/gschem/keymap.scm %{_datadir}/gEDA/scheme/gschem/selection.scm %{_datadir}/gEDA/scheme/gschem/util.scm %{_datadir}/gEDA/scheme/gschem/window.scm %{_datadir}/gEDA/bitmap %{_datadir}/icons/hicolor/*/apps/geda-gschem.* %{_datadir}/applications/geda-gschem.desktop %{_mandir}/man1/gschem.1.gz %files -n geda-gsymcheck %defattr(-,root,root) %{_bindir}/gsymcheck %{_datadir}/gEDA/system-gsymcheckrc/ %{_mandir}/man1/gsymcheck.1.gz %files -n geda-symbols %defattr(-,root,root) %{_datadir}/gEDA/sym %files -n geda-utils %defattr(-,root,root) %{_bindir}/convert_sym %{_bindir}/garchive %{_bindir}/gmk_sym %{_bindir}/grenum %{_bindir}/gsch2pcb %{_bindir}/gschlas %{_bindir}/gsymfix %{_bindir}/gxyrs %{_bindir}/olib %{_bindir}/pads_backannotate %{_bindir}/pcb_backannotate %{_bindir}/refdes_renum %{_bindir}/sarlacc_schem %{_bindir}/sarlacc_sym %{_bindir}/schdiff %{_bindir}/smash_megafile %{_bindir}/sw2asc %{_bindir}/tragesym %{_mandir}/man1/convert_sym.1.gz %{_mandir}/man1/garchive.1.gz %{_mandir}/man1/gmk_sym.1.gz %{_mandir}/man1/grenum.1.gz %{_mandir}/man1/gsch2pcb.1.gz %{_mandir}/man1/gschlas.1.gz %{_mandir}/man1/gsymfix.1.gz %{_mandir}/man1/gxyrs.1.gz %{_mandir}/man1/olib.1.gz %{_mandir}/man1/pads_backannotate.1.gz %{_mandir}/man1/pcb_backannotate.1.gz %{_mandir}/man1/refdes_renum.1.gz %{_mandir}/man1/sarlacc_schem.1.gz %{_mandir}/man1/sarlacc_sym.1.gz %{_mandir}/man1/schdiff.1.gz %{_mandir}/man1/smash_megafile.1.gz %{_mandir}/man1/sw2asc.1.gz %{_mandir}/man1/tragesym.1.gz %{_datadir}/gEDA/perl/ %{_datadir}/gEDA/system-gschlasrc/ %changelog ++++++ geda-gaf-rpmlintrc ++++++ addFilter("libgeda.*shlib-policy-name-error")++++++ grenum-no-build-time.patch ++++++ Index: geda-gaf-1.8.1/utils/src/grenum.c =================================================================== --- geda-gaf-1.8.1.orig/utils/src/grenum.c +++ geda-gaf-1.8.1/utils/src/grenum.c @@ -395,5 +395,4 @@ void printver() printf("This is grenum, an advanced refdes renumber utility for gEDA's gschem.\n"); printf("Version %s. gEDA/gaf version %s.%s\n",GRVERSION, PACKAGE_DOTTED_VERSION, PACKAGE_DATE_VERSION); - printf("Compiled on %s at %s\n",COMP_DATE,COMP_TIME); } Index: geda-gaf-1.8.1/utils/src/grenum.h =================================================================== --- geda-gaf-1.8.1.orig/utils/src/grenum.h +++ geda-gaf-1.8.1/utils/src/grenum.h @@ -1,8 +1,6 @@ /* $Id$ */ #include <stdio.h> #define GRVERSION "24052006" -#define COMP_DATE __DATE__ -#define COMP_TIME __TIME__ #define MAX_PREFIX_COUNT 50 /*This specifies the maximum number of different prefixes. e.g. Ux Rx Qx...*/ #define PAGE_JMP 100 /*There will be R101 R102 on page 1, R201 R202 on page 2.*/ #define COUNT_START 0 /*Start the counting from this number+1*/ ++++++ gschem-doc-path.patch ++++++ Index: geda-gaf-1.8.1/gschem/scheme/gschem/gschemdoc.scm =================================================================== --- geda-gaf-1.8.1.orig/gschem/scheme/gschem/gschemdoc.scm +++ geda-gaf-1.8.1/gschem/scheme/gschem/gschemdoc.scm @@ -50,7 +50,7 @@ Get the directory where gEDA documentati (lambda (dir) (let ((docdir (string-join (list (guess-prefix dir) - "share" "doc" "geda-gaf") + "share" "doc" "packages" "geda-gaf") separator))) (and (false-if-exception (eq? 'directory (stat:type (stat docdir)))) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit pigz for openSUSE:12.3:Update
by root＠hilbert.suse.de 26 Mar '13

26 Mar '13

Hello community, here is the log from the commit of package pigz for openSUSE:12.3:Update checked in at 2013-03-26 18:00:13 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.3:Update/pigz (Old) and /work/SRC/openSUSE:12.3:Update/.pigz.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "pigz", Maintainer is "AGraf(a)suse.com" Changes: -------- New Changes file: NO CHANGES FILE!!! New: ---- _link ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ _link ++++++ <link package='pigz.1466' cicount='copy' /> -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit patchinfo.1466 for openSUSE:12.1:Update
by root＠hilbert.suse.de 26 Mar '13

26 Mar '13

Hello community, here is the log from the commit of package patchinfo.1466 for openSUSE:12.1:Update checked in at 2013-03-26 18:00:14 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.1:Update/patchinfo.1466 (Old) and /work/SRC/openSUSE:12.1:Update/.patchinfo.1466.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "patchinfo.1466", Maintainer is "" Changes: -------- New Changes file: NO CHANGES FILE!!! New: ---- _patchinfo ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ _patchinfo ++++++ <patchinfo> <issue id="803933" tracker="bnc">VUL-0: CVE-2013-0296: pigz: pigz creates temp file with insecure permissions</issue> <issue id="CVE-2013-0296" tracker="cve" /> <category>security</category> <rating>moderate</rating> <packager>algraf</packager> <description> pigz incorrectly used world writeable permissions during unpacking (CVE-2013-0296). </description> <summary>pigz: fixed unpacking permissions</summary> </patchinfo> -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit pigz for openSUSE:12.2:Update
by root＠hilbert.suse.de 26 Mar '13

26 Mar '13

Hello community, here is the log from the commit of package pigz for openSUSE:12.2:Update checked in at 2013-03-26 18:00:10 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.2:Update/pigz (Old) and /work/SRC/openSUSE:12.2:Update/.pigz.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "pigz", Maintainer is "AGraf(a)suse.com" Changes: -------- New Changes file: NO CHANGES FILE!!! New: ---- _link ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ _link ++++++ <link package='pigz.1466' cicount='copy' /> -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit pigz.1466 for openSUSE:12.2:Update
by root＠hilbert.suse.de 26 Mar '13

26 Mar '13

Hello community, here is the log from the commit of package pigz.1466 for openSUSE:12.2:Update checked in at 2013-03-26 18:00:08 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.2:Update/pigz.1466 (Old) and /work/SRC/openSUSE:12.2:Update/.pigz.1466.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "pigz.1466", Maintainer is "" Changes: -------- New Changes file: --- /dev/null 2013-02-26 18:15:11.936010755 +0100 +++ /work/SRC/openSUSE:12.2:Update/.pigz.1466.new/pigz.changes 2013-03-26 18:00:09.000000000 +0100 @@ -0,0 +1,34 @@ +------------------------------------------------------------------- +Tue Mar 19 10:59:35 UTC 2013 - agraf(a)suse.com + +- fix temporary file permission bug (bnc#803933, CVE-2013-0296) + +------------------------------------------------------------------- +Fri Sep 30 15:54:33 UTC 2011 - uli(a)suse.com + +- cross-build workaround: use fake cc script to work around build + system that does not honor CC + +------------------------------------------------------------------- +Thu Jun 2 12:20:22 CEST 2011 - visnov(a)suse.cz + +- update to 2.1.6 +- package unpigz +- create debug packages +- package manpage + +------------------------------------------------------------------- +Tue Apr 20 00:44:25 CEST 2010 - agraf(a)suse.de + +- fix dictzip with #CPU == 1 (bnc#597756) + +------------------------------------------------------------------- +Wed Mar 3 16:12:37 CET 2010 - visnov(a)suse.de + +- include symlinks patch + +------------------------------------------------------------------- +Tue Oct 20 16:32:03 CEST 2009 - jmatejek(a)suse.de + +- initial package + New: ---- pigz-2.1.6.tar.bz2 pigz-always-thread.patch pigz-dictzip.patch pigz-do-symlinks.patch pigz-spl.patch pigz-tmpperm.patch pigz.changes pigz.spec ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pigz.spec ++++++ # # spec file for package pigz # # Copyright (c) 2013 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 # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # Please submit bugfixes or comments via http://bugs.opensuse.org/ # Name: pigz Version: 2.1.6 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: binutils BuildRequires: filesystem BuildRequires: glibc-devel BuildRequires: zlib-devel Requires: glibc Requires: zlib Source: %name-%version.tar.bz2 Patch1: pigz-dictzip.patch Patch2: pigz-spl.patch Patch3: pigz-do-symlinks.patch Patch4: pigz-always-thread.patch Patch5: pigz-tmpperm.patch Url: http://www.zlib.net/pigz/ Summary: Multi-core gzip version License: Zlib Group: Productivity/Archiving/Compression %description A parallel implementation of gzip for modern multi-processor, multi-core machines %prep %setup %patch1 -p1 %patch2 -p1 %patch3 -p1 %patch4 -p1 %patch5 -p1 %build export MYCFLAGS="${RPM_OPT_FLAGS}" echo -e "#!/bin/bash\nexec %__cc \"\$@\"" >cc chmod 755 cc export PATH=.:$PATH %{__make} CFLAGS="$MYCFLAGS" PREFIX=%{_prefix} LIBDIR=%{_libdir} %install mkdir -p $RPM_BUILD_ROOT/usr/bin cp -v pigz $RPM_BUILD_ROOT/usr/bin/ cp -v unpigz $RPM_BUILD_ROOT/usr/bin/ #man page mkdir -p $RPM_BUILD_ROOT/%{_mandir}/man1/ cp -v pigz.1 $RPM_BUILD_ROOT/%{_mandir}/man1/ cp -v pigz.1 $RPM_BUILD_ROOT/%{_mandir}/man1/unpigz.1 gzip $RPM_BUILD_ROOT/%{_mandir}/man1/pigz.1 gzip $RPM_BUILD_ROOT/%{_mandir}/man1/unpigz.1 %clean %{__rm} -rf "$RPM_BUILD_ROOT" %files %defattr(-,root,root) %doc README %doc %{_mandir}/man1/pigz.1.gz %doc %{_mandir}/man1/unpigz.1.gz /usr/bin/pigz /usr/bin/unpigz %changelog ++++++ pigz-always-thread.patch ++++++ Dictzip only really works in the threaded code paths. So let's force use them and ignore the non-parallel case (bnc#597756). Index: pigz-2.1.5/pigz.c =================================================================== --- pigz-2.1.5.orig/pigz.c +++ pigz-2.1.5/pigz.c @@ -2820,7 +2820,7 @@ local void process(char *path) unlzw(); } #ifndef NOTHREAD - else if (procs > 1) + else if (1) parallel_compress(); #endif else ++++++ pigz-dictzip.patch ++++++ diff -u -r pigz-2.1.6.orig/pigz.c pigz-2.1.6/pigz.c --- pigz-2.1.6.orig/pigz.c 2010-01-17 21:09:37.000000000 +0100 +++ pigz-2.1.6/pigz.c 2011-06-02 12:29:12.245689087 +0200 @@ -304,6 +304,8 @@ } \ } while (0) +#define DZIP_HEADER_LEN 24 + /* globals (modified by main thread only when it's the only thread) */ local int ind; /* input file descriptor */ local int outd; /* output file descriptor */ @@ -322,11 +324,12 @@ local int list; /* true to list files instead of compress */ local int first = 1; /* true if we need to print listing header */ local int decode; /* 0 to compress, 1 to decompress, 2 to test */ +local int dictzip; /* true to write random access dictionary */ local int level; /* compression level */ local int rsync; /* true for rsync blocking */ local int procs; /* maximum number of compression threads (>= 1) */ local int dict; /* true to initialize dictionary in each thread */ -local size_t size; /* uncompressed input size per thread (>= 32K) */ +size_t size; /* uncompressed input size per thread (>= 32K) */ /* saved gzip/zip header data for decompression, testing, and listing */ local time_t stamp; /* time stamp from gzip header */ @@ -560,6 +563,17 @@ return dos; } +long long get_file_size(int fd) +{ + long long old_pos = lseek(fd, 0, SEEK_CUR); + long long retval; + + retval = lseek(fd, 0, SEEK_END); + lseek(fd, old_pos, SEEK_SET); + + return retval; +} + /* put a 4-byte integer into a byte array in LSB order or MSB order */ #define PUT2L(a,b) (*(a)=(b)&0xff,(a)[1]=(b)>>8) #define PUT4L(a,b) (PUT2L(a,(b)&0xffff),PUT2L((a)+2,(b)>>16)) @@ -613,12 +627,27 @@ head[0] = 31; head[1] = 139; head[2] = 8; /* deflate */ - head[3] = name != NULL ? 8 : 0; + head[3] = 0; + if (dictzip) + head[3] |= 4; + if (name != NULL) + head[3] |= 8; PUT4L(head + 4, mtime); head[8] = level == 9 ? 2 : (level == 1 ? 4 : 0); head[9] = 3; /* unix */ writen(outd, head, 10); len = 10; + if (dictzip) { + long long file_len = get_file_size(ind); + int extra_len = DZIP_HEADER_LEN + ((file_len / size) + 2) * sizeof(int); + + char *extra = (char*)malloc(extra_len); + + memset(extra, 0, extra_len); + writen(outd, extra, extra_len); + free(extra); + len += extra_len; + } if (name != NULL) writen(outd, (unsigned char *)name, strlen(name) + 1); if (name != NULL) @@ -1165,6 +1194,10 @@ unsigned long ulen; /* total uncompressed size (overflow ok) */ unsigned long clen; /* total compressed size (overflow ok) */ unsigned long check; /* check value of uncompressed data */ + char *extra = NULL; /* dictzip extra header field */ + int dz_cur; /* dictzip current pointer to header */ + long long file_len = get_file_size(ind); + int extra_len = DZIP_HEADER_LEN + ((file_len / size) + 2) * sizeof(int); (void)dummy; @@ -1172,6 +1205,25 @@ Trace(("-- write thread running")); head = put_header(); + if (dictzip) { + extra = (char*)malloc(extra_len + 32); + memset(extra, 0, extra_len); + + if (extra_len >= ((1ULL << 16) - 1)) + bail("file too long for dictzip\n", ""); + /* extra length */ + PUT2L(extra, extra_len - 2); + /* Random Access ID */ + extra[2] = 'R'; + extra[3] = 'A'; + /* RA version 99 */ + /* XXX need to standardize! */ + PUT2L(extra + 6, 99); + // PUT2L(extra + 6, 1); + + dz_cur = 0; + } + /* process output of compress threads until end of input */ ulen = clen = 0; check = CHECK(0L, Z_NULL, 0); @@ -1191,6 +1243,15 @@ ulen += (unsigned long)len; clen += (unsigned long)(job->out->len); + if (dictzip) { + if (((dz_cur * 4) + DZIP_HEADER_LEN + sizeof(int)) > extra_len) { + printf(" %d > %d\n", dz_cur, file_len / size); + bail ("input file too large\n", ""); + } + PUT4L(extra + (dz_cur * 4) + DZIP_HEADER_LEN, job->out->len); + dz_cur++; + } + /* write the compressed data and drop the output buffer */ Trace(("-- writing #%ld", seq)); writen(outd, job->out->buf, job->out->len); @@ -1215,6 +1276,22 @@ /* write trailer */ put_trailer(ulen, clen, check, head); + if (dictzip) { + /* chunk length */ + PUT4L(extra + 8, size); + /* chunk count */ + PUT4L(extra + 12, dz_cur); +// PUT4L(extra + 12, (file_len / size) + 1); + /* Target file size (64 bit) */ + PUT4L(extra + 16, file_len); + PUT4L(extra + 20, file_len >> 32); + /* write extra header */ + if (lseek(outd, 10, SEEK_SET) != 10) + bail("couldn't seek in output file\n", ""); + writen(outd, extra, extra_len); + free(extra); + } + /* verify no more jobs, prepare for next use */ possess(compress_have); assert(compress_head == NULL && peek_lock(compress_have) == 0); @@ -2625,6 +2702,18 @@ /* prepare gzip header information for compression */ name = headis & 1 ? justname(in) : NULL; mtime = headis & 2 ? st.st_mtime : 0; + + /* Find a sane chunk size */ + if (dictzip) { + long long file_len = get_file_size(ind); + int extra_len; + + extra_len = DZIP_HEADER_LEN + ((file_len / size) + 2) * sizeof(int); + while (extra_len >= ((1 << 16) - 1)) { + size += (1 << 10ULL); + extra_len = DZIP_HEADER_LEN + ((file_len / size) + 2) * sizeof(int); + } + } } SET_BINARY_MODE(ind); @@ -2678,6 +2767,8 @@ out = malloc(strlen("<stdout>") + 1); if (out == NULL) bail("not enough memory", ""); + if (dictzip) + bail("need to have a seekable output for dictzip\n", ""); strcpy(out, "<stdout>"); outd = 1; if (!decode && !force && isatty(outd)) @@ -2796,6 +2887,7 @@ " -i, --independent Compress blocks independently for damage recovery", " -R, --rsyncable Input-determined block locations for rsync", " -d, --decompress Decompress the compressed input", +" -e, --dictzip Write dictzip random seek information in gzip header", " -t, --test Test the integrity of the compressed input", " -l, --list List the contents of the compressed input", " -f, --force Force overwrite, compress .gz, links, and to terminal", @@ -2868,17 +2960,18 @@ force = 0; /* don't overwrite, don't compress links */ recurse = 0; /* don't go into directories */ form = 0; /* use gzip format */ + dictzip = 0; /* don't write dictzip information */ } /* long options conversion to short options */ local char *longopts[][2] = { {"LZW", "Z"}, {"ascii", "a"}, {"best", "9"}, {"bits", "Z"}, - {"blocksize", "b"}, {"decompress", "d"}, {"fast", "1"}, {"force", "f"}, - {"help", "h"}, {"independent", "i"}, {"keep", "k"}, {"license", "L"}, - {"list", "l"}, {"name", "N"}, {"no-name", "n"}, {"no-time", "T"}, - {"processes", "p"}, {"quiet", "q"}, {"recursive", "r"}, {"rsyncable", "R"}, - {"silent", "q"}, {"stdout", "c"}, {"suffix", "S"}, {"test", "t"}, - {"to-stdout", "c"}, {"uncompress", "d"}, {"verbose", "v"}, + {"blocksize", "b"}, {"decompress", "d"}, {"dictzip", "e"}, {"fast", "1"}, + {"force", "f"}, {"help", "h"}, {"independent", "i"}, {"keep", "k"}, + {"license", "L"}, {"list", "l"}, {"name", "N"}, {"no-name", "n"}, + {"no-time", "T"}, {"processes", "p"}, {"quiet", "q"}, {"recursive", "r"}, + {"rsyncable", "R"}, {"silent", "q"}, {"stdout", "c"}, {"suffix", "S"}, + {"test", "t"}, {"to-stdout", "c"}, {"uncompress", "d"}, {"verbose", "v"}, {"version", "V"}, {"zip", "K"}, {"zlib", "z"}}; #define NLOPTS (sizeof(longopts) / (sizeof(char *) << 1)) @@ -2984,6 +3077,7 @@ case 'b': get = 1; break; case 'c': pipeout = 1; break; case 'd': decode = 1; headis = 0; break; + case 'e': dictzip = 1; dict = 0; break; case 'f': force = 1; break; case 'h': help(); break; case 'i': dict = 0; break; @@ -3112,6 +3206,19 @@ fprintf(stderr, "warning: output is concatenated zip files "); fprintf(stderr, "-- pigz will not be able to extract\n"); } + + /* dictzip sanity checks */ + if (dictzip && (form > 1)) { + fprintf(stderr, "warning: dictzip only works on gzip files\n"); + } + +#if 0 + if (dictzip && (size >= (64 << 10))) { + fprintf(stderr, "warning: dictzip needs chunks < 64k.\n"); + size = (63 << 10); + } +#endif + process(strcmp(argv[n], "-") ? argv[n] : NULL); done++; } ++++++ pigz-do-symlinks.patch ++++++ --- pigz-2.1.6/pigz.c.orig 2011-06-02 12:36:40.043909605 +0200 +++ pigz-2.1.6/pigz.c 2011-06-02 12:39:32.148763023 +0200 @@ -2596,11 +2596,13 @@ in); return; } +#if 0 if ((st.st_mode & S_IFMT) == S_IFLNK && !force && !pipeout) { if (verbosity > 0) fprintf(stderr, "%s is a symbolic link -- skipping\n", in); return; } +#endif if ((st.st_mode & S_IFMT) == S_IFDIR && !recurse) { if (verbosity > 0) fprintf(stderr, "%s is a directory -- skipping\n", in); ++++++ pigz-spl.patch ++++++ --- pigz-2.1.6/pigz.c.orig 2011-06-02 12:36:25.000000000 +0200 +++ pigz-2.1.6/pigz.c 2011-06-02 12:36:40.043909605 +0200 @@ -1861,7 +1861,7 @@ nm += len - 4; len = 4; if (strcmp(nm, ".zip") == 0 || strcmp(nm, ".ZIP") == 0 || - strcmp(nm, ".tgz") == 0) + strcmp(nm, ".tgz") == 0 || strcmp(nm, ".spl") == 0) return 4; } if (len > 3) { ++++++ pigz-tmpperm.patch ++++++ Index: pigz/pigz.c =================================================================== --- pigz-2.2.4/pigz.c (Revision 4038) +++ pigz-2.2.5/pigz.c (Arbeitskopie) @@ -3228,7 +3228,7 @@ memcpy(out, to, len); strcpy(out + len, decode ? "" : sufx); outd = open(out, O_CREAT | O_TRUNC | O_WRONLY | - (force ? 0 : O_EXCL), 0666); + (force ? 0 : O_EXCL), 0600); /* if exists and not -f, give user a chance to overwrite */ if (outd < 0 && errno == EEXIST && isatty(0) && verbosity) { @@ -3244,7 +3244,7 @@ } while (ch != EOF && ch != '\n' && ch != '\r'); if (reply == 1) outd = open(out, O_CREAT | O_TRUNC | O_WRONLY, - 0666); + 0600); } /* if exists and no overwrite, report and go on to next */ -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit pigz for openSUSE:12.1:Update
by root＠hilbert.suse.de 26 Mar '13

26 Mar '13

Hello community, here is the log from the commit of package pigz for openSUSE:12.1:Update checked in at 2013-03-26 18:00:07 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.1:Update/pigz (Old) and /work/SRC/openSUSE:12.1:Update/.pigz.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "pigz", Maintainer is "AGraf(a)suse.com" Changes: -------- New Changes file: NO CHANGES FILE!!! New: ---- _link ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ _link ++++++ <link package='pigz.1466' cicount='copy' /> -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0