openSUSE Commits
Threads by month
- ----- 2025 -----
- January
- ----- 2024 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2023 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2022 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2021 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2020 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2019 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2018 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2017 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2016 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2015 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2014 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2013 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2012 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2011 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2010 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2009 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2008 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2007 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2006 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
September 2013
- 1 participants
- 2223 discussions
Hello community,
here is the log from the commit of package skelcd-control-openSUSE for openSUSE:Factory checked in at 2013-09-29 17:52:16
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/skelcd-control-openSUSE (Old)
and /work/SRC/openSUSE:Factory/.skelcd-control-openSUSE.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "skelcd-control-openSUSE"
Changes:
--------
New Changes file:
--- /dev/null 2013-09-21 22:50:09.852032506 +0200
+++ /work/SRC/openSUSE:Factory/.skelcd-control-openSUSE.new/skelcd-control-openSUSE-promo.changes 2013-09-29 17:52:18.000000000 +0200
@@ -0,0 +1,1146 @@
+-------------------------------------------------------------------
+Fri Sep 27 12:07:35 UTC 2013 - coolo(a)suse.com
+
+- add a warning for updating old openSUSE versions
+- add a special control.xml for promo dvd to warn about all updates
+
+-------------------------------------------------------------------
+Fri Sep 27 13:51:41 CEST 2013 - jsuchome(a)suse.cz
+
+- yast2-mouse dropped
+
+-------------------------------------------------------------------
+Mon Sep 2 15:17:48 CEST 2013 - jsuchome(a)suse.cz
+
+- do not install xorg-x11 (bnc#837450)
+
+-------------------------------------------------------------------
+Mon Jun 24 08:52:17 CEST 2013 - jsuchome(a)suse.cz
+
+- show checkbox for adding online repositories during installation
+- add e17 desktop to the list of desktops (fate#315061)
+
+-------------------------------------------------------------------
+Mon May 27 15:27:12 CEST 2013 - locilka(a)suse.com
+
+- Using unique IDs while calling rpmcopy_secondstage to prevent
+ from disabling this step in AutoYaST or Upgrade while it should
+ be disabled only in Installation (bnc#813072).
+
+-------------------------------------------------------------------
+Thu May 16 15:44:34 UTC 2013 - coolo(a)suse.com
+
+- change urls to 13.1
+
+-------------------------------------------------------------------
+Fri Mar 29 11:51:03 CET 2013 - jsuchome(a)suse.cz
+
+- Guide user to drivers.suse.com if HW was not found
+ (fate#312875, bnc#805251)
+
+-------------------------------------------------------------------
+Fri Feb 1 13:42:32 UTC 2013 - coolo(a)suse.com
+
+- use 12.3 community repos
+
+-------------------------------------------------------------------
+Tue Oct 23 14:12:36 CEST 2012 - jsuchome(a)suse.cz
+
+- removed inst_suseconfig step (global SuSEconfig removal)
+
+-------------------------------------------------------------------
+Tue Oct 2 15:37:29 UTC 2012 - bwiedemann(a)suse.com
+
+- update to 12.3 repos
+
+-------------------------------------------------------------------
+Thu Jun 28 12:05:14 UTC 2012 - lnussel(a)suse.de
+
+- add non-oss update repo
+
+-------------------------------------------------------------------
+Mon Jun 25 08:40:43 UTC 2012 - coolo(a)suse.com
+
+- use 12.2 repos for "community"
+
+-------------------------------------------------------------------
+Thu Jun 14 08:18:53 UTC 2012 - mlin(a)suse.com
+
+- Desktop 'kde-plasma' replaced with 'kde4' (bnc#763142)
+
+-------------------------------------------------------------------
+Mon Feb 13 12:27:08 UTC 2012 - coolo(a)suse.com
+
+- update to 12.2 repos (bnc#746668)
+
+-------------------------------------------------------------------
+Tue Dec 6 13:28:32 UTC 2011 - coolo(a)suse.com
+
+- YaST is not a license
+
+-------------------------------------------------------------------
+Thu Oct 27 15:29:49 CEST 2011 - jsuchome(a)suse.cz
+
+- save ecdsa keys as well (bnc#726468)
+
+-------------------------------------------------------------------
+Mon Oct 17 07:31:51 UTC 2011 - coolo(a)suse.com
+
+- require branding-openSUSE for yast
+
+-------------------------------------------------------------------
+Mon Sep 26 14:28:50 CEST 2011 - jsuchome(a)suse.cz
+
+- also ensure lightdm package is installed
+
+-------------------------------------------------------------------
+Mon Sep 26 10:30:45 CEST 2011 - jsuchome(a)suse.cz
+
+- use lightdm as default DM for Xfce
+
+-------------------------------------------------------------------
+Thu Sep 1 09:09:20 UTC 2011 - coolo(a)suse.com
+
+- install minimal_base-conflicts for minimal text
+
+-------------------------------------------------------------------
+Tue Jun 7 07:16:40 UTC 2011 - coolo(a)novell.com
+
+- use 12.1 community repos url
+
+-------------------------------------------------------------------
+Mon May 30 11:23:18 UTC 2011 - coolo(a)novell.com
+
+- update control.xml to get 12.1 repos
+
+-------------------------------------------------------------------
+Fri May 20 12:38:03 UTC 2011 - lnussel(a)suse.de
+
+- change write_hostname_to_hosts to false (fate#308824)
+
+-------------------------------------------------------------------
+Mon Feb 28 17:10:54 UTC 2011 - coolo(a)novell.com
+
+- use 114 community repos
+
+-------------------------------------------------------------------
+Tue Feb 8 15:10:25 CET 2011 - locilka(a)suse.cz
+
+- Adapted openSUSE control file to the current naming schema of
+ desktops (BNC #667408)
+
+-------------------------------------------------------------------
+Thu Feb 3 09:58:17 CET 2011 - jsrain(a)suse.cz
+
+- fixed consistency issues in live installer proposal
+
+-------------------------------------------------------------------
+Fri Jan 28 12:43:39 UTC 2011 - coolo(a)novell.com
+
+- change "minimal text" from base to minimal_base
+
+-------------------------------------------------------------------
+Mon Jan 24 09:58:48 CET 2011 - jsrain(a)suse.cz
+
+- adaptations for unattended migration (fate#310481)
+
+-------------------------------------------------------------------
+Mon Jan 17 14:39:54 UTC 2011 - coolo(a)novell.com
+
+- make reduced package list really minimal (once again, bnc#577791)
+
+-------------------------------------------------------------------
+Mon Jan 17 12:06:21 UTC 2011 - coolo(a)novell.com
+
+- add debug update repo too (bnc#633628)
+
+-------------------------------------------------------------------
+Fri Jan 7 13:43:01 CET 2011 - jsrain(a)suse.cz
+
+- update XFCE desktop definition
+
+-------------------------------------------------------------------
+Tue Aug 31 12:00:32 UTC 2010 - coolo(a)novell.com
+
+- update 11.4 urls
+
+-------------------------------------------------------------------
+Wed Jun 23 08:14:11 UTC 2010 - coolo(a)novell.com
+
+- use 11.3 url also for community repos (bnc#616355)
+
+-------------------------------------------------------------------
+Tue Feb 9 17:06:15 CET 2010 - locilka(a)suse.cz
+
+- Steps 'user' and 'auth' enabled again in Live mode (BNC #547931).
+
+-------------------------------------------------------------------
+Tue Feb 2 11:03:04 CET 2010 - locilka(a)suse.cz
+
+- Added LXDE desktop (FATE #307729).
+
+-------------------------------------------------------------------
+Thu Jan 21 14:30:36 UTC 2010 - coolo(a)novell.com
+
+- replace 11.2 urls by 11.3
+
+-------------------------------------------------------------------
+Wed Jan 20 08:25:51 UTC 2010 - coolo(a)novell.com
+
+- update to SVN to get new kdm package name and some storage fixes
+
+-------------------------------------------------------------------
+Tue Nov 24 16:58:22 CET 2009 - kmachalkova(a)suse.cz
+
+- New variable in globals: run_init_scripts_in_parallel, to set
+ /etc/sysconfig/boot:RUN_PARALLEL (FaTE#307555)
+
++++ 949 more lines (skipped)
++++ between /dev/null
++++ and /work/SRC/openSUSE:Factory/.skelcd-control-openSUSE.new/skelcd-control-openSUSE-promo.changes
--- /work/SRC/openSUSE:Factory/skelcd-control-openSUSE/skelcd-control-openSUSE.changes 2013-09-25 14:38:52.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.skelcd-control-openSUSE.new/skelcd-control-openSUSE.changes 2013-09-29 17:52:18.000000000 +0200
@@ -1,0 +2,11 @@
+Fri Sep 27 12:07:35 UTC 2013 - coolo(a)suse.com
+
+- add a warning for updating old openSUSE versions
+- add a special control.xml for promo dvd to warn about all updates
+
+-------------------------------------------------------------------
+Fri Sep 27 13:51:41 CEST 2013 - jsuchome(a)suse.cz
+
+- yast2-mouse dropped
+
+-------------------------------------------------------------------
New:
----
control.promo.diff
pre_checkin.sh
skelcd-control-openSUSE-promo.changes
skelcd-control-openSUSE-promo.spec
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ skelcd-control-openSUSE-promo.spec ++++++
#
# spec file for package skelcd-control-openSUSE-promo
#
# 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: skelcd-control-openSUSE-promo
BuildRequires: libxml2
# new global option - FaTE#307555
BuildRequires: yast2-installation >= 2.19.0
Url: http://www.suse.com/
AutoReqProv: off
Version: 2013.5.16
Release: 0
Summary: SuSE Linux Professional Control file
License: MIT
Group: Metapackages
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source0: control.xml
Source1: control.promo.diff
Provides: product_control
Conflicts: product_control
%description
Control file for installation
%prep
%build
%install
#
# Add control file
#
mkdir -p $RPM_BUILD_ROOT/CD1
#
# Verify syntax
#
install -m 644 %{SOURCE0} $RPM_BUILD_ROOT/CD1/control.xml
%if "%{name}" == "skelcd-control-openSUSE-promo"
patch $RPM_BUILD_ROOT/CD1/control.xml %{SOURCE1}
%endif
xmllint --noout --relaxng /usr/share/YaST2/control/control.rng $RPM_BUILD_ROOT/CD1/control.xml
install -m 644 %{SOURCE0} $RPM_BUILD_ROOT/CD1/
%ifarch ppc ppc64
sed -i -e "s,http://download.opensuse.org/distribution/,http://powerpc.opensuse.org/di…," $RPM_BUILD_ROOT/CD1/control.xml
sed -i -e "s,http://download.opensuse.org/debug/,http://powerpc.opensuse.org/debug/," $RPM_BUILD_ROOT/CD1/control.xml
sed -i -e "s,http://download.opensuse.org/source/,http://powerpc.opensuse.org/source/," $RPM_BUILD_ROOT/CD1/control.xml
diff -u %{SOURCE0} $RPM_BUILD_ROOT/CD1/control.xml || true
%endif
%files
%defattr(644,root,root,755)
%dir /CD1
/CD1/control.xml
%changelog
++++++ skelcd-control-openSUSE.spec ++++++
--- /var/tmp/diff_new_pack.NWK8vg/_old 2013-09-29 17:52:19.000000000 +0200
+++ /var/tmp/diff_new_pack.NWK8vg/_new 2013-09-29 17:52:19.000000000 +0200
@@ -28,8 +28,10 @@
License: MIT
Group: Metapackages
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source: control.xml
+Source0: control.xml
+Source1: control.promo.diff
Provides: product_control
+Conflicts: product_control
%description
Control file for installation
@@ -46,8 +48,11 @@
#
# Verify syntax
#
-cd $RPM_SOURCE_DIR
-xmllint --noout --relaxng /usr/share/YaST2/control/control.rng %{SOURCE0}
+install -m 644 %{SOURCE0} $RPM_BUILD_ROOT/CD1/control.xml
+%if "%{name}" == "skelcd-control-openSUSE-promo"
+patch $RPM_BUILD_ROOT/CD1/control.xml %{SOURCE1}
+%endif
+xmllint --noout --relaxng /usr/share/YaST2/control/control.rng $RPM_BUILD_ROOT/CD1/control.xml
install -m 644 %{SOURCE0} $RPM_BUILD_ROOT/CD1/
%ifarch ppc ppc64
sed -i -e "s,http://download.opensuse.org/distribution/,http://powerpc.opensuse.org/di…," $RPM_BUILD_ROOT/CD1/control.xml
++++++ control.promo.diff ++++++
--- control.xml 2013-09-27 13:58:16.683586483 +0200
+++ control.xml.promo 2013-09-27 13:58:47.389998686 +0200
@@ -188,8 +188,7 @@
<selection_type config:type="symbol">auto</selection_type>
- <!-- warn on older suse -->
+ <!-- basically warn everywhere -->
<products_supported_for_upgrade config:type="list">
- <regexp_item>^openSUSE 12\..*</regexp_item>
- <regexp_item>^openSUSE 13\..*$</regexp_item>
+ <regexp_item>^openSUSE-Promo</regexp_item>
</products_supported_for_upgrade>
++++++ control.xml ++++++
--- /var/tmp/diff_new_pack.NWK8vg/_old 2013-09-29 17:52:19.000000000 +0200
+++ /var/tmp/diff_new_pack.NWK8vg/_new 2013-09-29 17:52:19.000000000 +0200
@@ -187,6 +187,12 @@
<delete_old_packages config:type="boolean">true</delete_old_packages>
<selection_type config:type="symbol">auto</selection_type>
+ <!-- warn on older suse -->
+ <products_supported_for_upgrade config:type="list">
+ <regexp_item>^openSUSE 12\..*</regexp_item>
+ <regexp_item>^openSUSE 13\..*$</regexp_item>
+ </products_supported_for_upgrade>
+
<!-- Bugzilla #327791, if not set, default is true -->
<online_repos_preselected config:type="boolean">false</online_repos_preselected>
@@ -492,10 +498,6 @@
<name>hwinfo</name>
<presentation_order>80</presentation_order>
</proposal_module>
- <proposal_module>
- <name>mouse</name>
- <presentation_order>90</presentation_order>
- </proposal_module>
<!-- software proposal should be computed almost at the end -->
<proposal_module>
<name>software</name>
@@ -532,7 +534,6 @@
<proposal_modules config:type="list">
<proposal_module>hwinfo</proposal_module>
<proposal_module>keyboard</proposal_module>
- <proposal_module>mouse</proposal_module>
<proposal_module>partitions</proposal_module>
<proposal_module>software</proposal_module>
<proposal_module>bootloader</proposal_module>
++++++ pre_checkin.sh ++++++
#! /bin/sh
cp skelcd-control-openSUSE.changes skelcd-control-openSUSE-promo.changes
sed -e 's,^Name.*,Name: skelcd-control-openSUSE-promo,' skelcd-control-openSUSE.spec > skelcd-control-openSUSE-promo.spec
osc service localrun format_spec_file
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package skelcd-control-openSUSE for openSUSE:13.1 checked in at 2013-09-29 17:52:18
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:13.1/skelcd-control-openSUSE (Old)
and /work/SRC/openSUSE:13.1/.skelcd-control-openSUSE.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "skelcd-control-openSUSE"
Changes:
--------
New Changes file:
--- /dev/null 2013-09-21 22:50:09.852032506 +0200
+++ /work/SRC/openSUSE:13.1/.skelcd-control-openSUSE.new/skelcd-control-openSUSE-promo.changes 2013-09-29 17:52:19.000000000 +0200
@@ -0,0 +1,1146 @@
+-------------------------------------------------------------------
+Fri Sep 27 12:07:35 UTC 2013 - coolo(a)suse.com
+
+- add a warning for updating old openSUSE versions
+- add a special control.xml for promo dvd to warn about all updates
+
+-------------------------------------------------------------------
+Fri Sep 27 13:51:41 CEST 2013 - jsuchome(a)suse.cz
+
+- yast2-mouse dropped
+
+-------------------------------------------------------------------
+Mon Sep 2 15:17:48 CEST 2013 - jsuchome(a)suse.cz
+
+- do not install xorg-x11 (bnc#837450)
+
+-------------------------------------------------------------------
+Mon Jun 24 08:52:17 CEST 2013 - jsuchome(a)suse.cz
+
+- show checkbox for adding online repositories during installation
+- add e17 desktop to the list of desktops (fate#315061)
+
+-------------------------------------------------------------------
+Mon May 27 15:27:12 CEST 2013 - locilka(a)suse.com
+
+- Using unique IDs while calling rpmcopy_secondstage to prevent
+ from disabling this step in AutoYaST or Upgrade while it should
+ be disabled only in Installation (bnc#813072).
+
+-------------------------------------------------------------------
+Thu May 16 15:44:34 UTC 2013 - coolo(a)suse.com
+
+- change urls to 13.1
+
+-------------------------------------------------------------------
+Fri Mar 29 11:51:03 CET 2013 - jsuchome(a)suse.cz
+
+- Guide user to drivers.suse.com if HW was not found
+ (fate#312875, bnc#805251)
+
+-------------------------------------------------------------------
+Fri Feb 1 13:42:32 UTC 2013 - coolo(a)suse.com
+
+- use 12.3 community repos
+
+-------------------------------------------------------------------
+Tue Oct 23 14:12:36 CEST 2012 - jsuchome(a)suse.cz
+
+- removed inst_suseconfig step (global SuSEconfig removal)
+
+-------------------------------------------------------------------
+Tue Oct 2 15:37:29 UTC 2012 - bwiedemann(a)suse.com
+
+- update to 12.3 repos
+
+-------------------------------------------------------------------
+Thu Jun 28 12:05:14 UTC 2012 - lnussel(a)suse.de
+
+- add non-oss update repo
+
+-------------------------------------------------------------------
+Mon Jun 25 08:40:43 UTC 2012 - coolo(a)suse.com
+
+- use 12.2 repos for "community"
+
+-------------------------------------------------------------------
+Thu Jun 14 08:18:53 UTC 2012 - mlin(a)suse.com
+
+- Desktop 'kde-plasma' replaced with 'kde4' (bnc#763142)
+
+-------------------------------------------------------------------
+Mon Feb 13 12:27:08 UTC 2012 - coolo(a)suse.com
+
+- update to 12.2 repos (bnc#746668)
+
+-------------------------------------------------------------------
+Tue Dec 6 13:28:32 UTC 2011 - coolo(a)suse.com
+
+- YaST is not a license
+
+-------------------------------------------------------------------
+Thu Oct 27 15:29:49 CEST 2011 - jsuchome(a)suse.cz
+
+- save ecdsa keys as well (bnc#726468)
+
+-------------------------------------------------------------------
+Mon Oct 17 07:31:51 UTC 2011 - coolo(a)suse.com
+
+- require branding-openSUSE for yast
+
+-------------------------------------------------------------------
+Mon Sep 26 14:28:50 CEST 2011 - jsuchome(a)suse.cz
+
+- also ensure lightdm package is installed
+
+-------------------------------------------------------------------
+Mon Sep 26 10:30:45 CEST 2011 - jsuchome(a)suse.cz
+
+- use lightdm as default DM for Xfce
+
+-------------------------------------------------------------------
+Thu Sep 1 09:09:20 UTC 2011 - coolo(a)suse.com
+
+- install minimal_base-conflicts for minimal text
+
+-------------------------------------------------------------------
+Tue Jun 7 07:16:40 UTC 2011 - coolo(a)novell.com
+
+- use 12.1 community repos url
+
+-------------------------------------------------------------------
+Mon May 30 11:23:18 UTC 2011 - coolo(a)novell.com
+
+- update control.xml to get 12.1 repos
+
+-------------------------------------------------------------------
+Fri May 20 12:38:03 UTC 2011 - lnussel(a)suse.de
+
+- change write_hostname_to_hosts to false (fate#308824)
+
+-------------------------------------------------------------------
+Mon Feb 28 17:10:54 UTC 2011 - coolo(a)novell.com
+
+- use 114 community repos
+
+-------------------------------------------------------------------
+Tue Feb 8 15:10:25 CET 2011 - locilka(a)suse.cz
+
+- Adapted openSUSE control file to the current naming schema of
+ desktops (BNC #667408)
+
+-------------------------------------------------------------------
+Thu Feb 3 09:58:17 CET 2011 - jsrain(a)suse.cz
+
+- fixed consistency issues in live installer proposal
+
+-------------------------------------------------------------------
+Fri Jan 28 12:43:39 UTC 2011 - coolo(a)novell.com
+
+- change "minimal text" from base to minimal_base
+
+-------------------------------------------------------------------
+Mon Jan 24 09:58:48 CET 2011 - jsrain(a)suse.cz
+
+- adaptations for unattended migration (fate#310481)
+
+-------------------------------------------------------------------
+Mon Jan 17 14:39:54 UTC 2011 - coolo(a)novell.com
+
+- make reduced package list really minimal (once again, bnc#577791)
+
+-------------------------------------------------------------------
+Mon Jan 17 12:06:21 UTC 2011 - coolo(a)novell.com
+
+- add debug update repo too (bnc#633628)
+
+-------------------------------------------------------------------
+Fri Jan 7 13:43:01 CET 2011 - jsrain(a)suse.cz
+
+- update XFCE desktop definition
+
+-------------------------------------------------------------------
+Tue Aug 31 12:00:32 UTC 2010 - coolo(a)novell.com
+
+- update 11.4 urls
+
+-------------------------------------------------------------------
+Wed Jun 23 08:14:11 UTC 2010 - coolo(a)novell.com
+
+- use 11.3 url also for community repos (bnc#616355)
+
+-------------------------------------------------------------------
+Tue Feb 9 17:06:15 CET 2010 - locilka(a)suse.cz
+
+- Steps 'user' and 'auth' enabled again in Live mode (BNC #547931).
+
+-------------------------------------------------------------------
+Tue Feb 2 11:03:04 CET 2010 - locilka(a)suse.cz
+
+- Added LXDE desktop (FATE #307729).
+
+-------------------------------------------------------------------
+Thu Jan 21 14:30:36 UTC 2010 - coolo(a)novell.com
+
+- replace 11.2 urls by 11.3
+
+-------------------------------------------------------------------
+Wed Jan 20 08:25:51 UTC 2010 - coolo(a)novell.com
+
+- update to SVN to get new kdm package name and some storage fixes
+
+-------------------------------------------------------------------
+Tue Nov 24 16:58:22 CET 2009 - kmachalkova(a)suse.cz
+
+- New variable in globals: run_init_scripts_in_parallel, to set
+ /etc/sysconfig/boot:RUN_PARALLEL (FaTE#307555)
+
++++ 949 more lines (skipped)
++++ between /dev/null
++++ and /work/SRC/openSUSE:13.1/.skelcd-control-openSUSE.new/skelcd-control-openSUSE-promo.changes
--- /work/SRC/openSUSE:13.1/skelcd-control-openSUSE/skelcd-control-openSUSE.changes 2013-09-25 14:38:53.000000000 +0200
+++ /work/SRC/openSUSE:13.1/.skelcd-control-openSUSE.new/skelcd-control-openSUSE.changes 2013-09-29 17:52:19.000000000 +0200
@@ -1,0 +2,11 @@
+Fri Sep 27 12:07:35 UTC 2013 - coolo(a)suse.com
+
+- add a warning for updating old openSUSE versions
+- add a special control.xml for promo dvd to warn about all updates
+
+-------------------------------------------------------------------
+Fri Sep 27 13:51:41 CEST 2013 - jsuchome(a)suse.cz
+
+- yast2-mouse dropped
+
+-------------------------------------------------------------------
New:
----
control.promo.diff
pre_checkin.sh
skelcd-control-openSUSE-promo.changes
skelcd-control-openSUSE-promo.spec
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ skelcd-control-openSUSE-promo.spec ++++++
#
# spec file for package skelcd-control-openSUSE-promo
#
# 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: skelcd-control-openSUSE-promo
BuildRequires: libxml2
# new global option - FaTE#307555
BuildRequires: yast2-installation >= 2.19.0
Url: http://www.suse.com/
AutoReqProv: off
Version: 2013.5.16
Release: 0
Summary: SuSE Linux Professional Control file
License: MIT
Group: Metapackages
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source0: control.xml
Source1: control.promo.diff
Provides: product_control
Conflicts: product_control
%description
Control file for installation
%prep
%build
%install
#
# Add control file
#
mkdir -p $RPM_BUILD_ROOT/CD1
#
# Verify syntax
#
install -m 644 %{SOURCE0} $RPM_BUILD_ROOT/CD1/control.xml
%if "%{name}" == "skelcd-control-openSUSE-promo"
patch $RPM_BUILD_ROOT/CD1/control.xml %{SOURCE1}
%endif
xmllint --noout --relaxng /usr/share/YaST2/control/control.rng $RPM_BUILD_ROOT/CD1/control.xml
install -m 644 %{SOURCE0} $RPM_BUILD_ROOT/CD1/
%ifarch ppc ppc64
sed -i -e "s,http://download.opensuse.org/distribution/,http://powerpc.opensuse.org/di…," $RPM_BUILD_ROOT/CD1/control.xml
sed -i -e "s,http://download.opensuse.org/debug/,http://powerpc.opensuse.org/debug/," $RPM_BUILD_ROOT/CD1/control.xml
sed -i -e "s,http://download.opensuse.org/source/,http://powerpc.opensuse.org/source/," $RPM_BUILD_ROOT/CD1/control.xml
diff -u %{SOURCE0} $RPM_BUILD_ROOT/CD1/control.xml || true
%endif
%files
%defattr(644,root,root,755)
%dir /CD1
/CD1/control.xml
%changelog
++++++ skelcd-control-openSUSE.spec ++++++
--- /var/tmp/diff_new_pack.xBWK3U/_old 2013-09-29 17:52:19.000000000 +0200
+++ /var/tmp/diff_new_pack.xBWK3U/_new 2013-09-29 17:52:19.000000000 +0200
@@ -28,8 +28,10 @@
License: MIT
Group: Metapackages
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source: control.xml
+Source0: control.xml
+Source1: control.promo.diff
Provides: product_control
+Conflicts: product_control
%description
Control file for installation
@@ -46,8 +48,11 @@
#
# Verify syntax
#
-cd $RPM_SOURCE_DIR
-xmllint --noout --relaxng /usr/share/YaST2/control/control.rng %{SOURCE0}
+install -m 644 %{SOURCE0} $RPM_BUILD_ROOT/CD1/control.xml
+%if "%{name}" == "skelcd-control-openSUSE-promo"
+patch $RPM_BUILD_ROOT/CD1/control.xml %{SOURCE1}
+%endif
+xmllint --noout --relaxng /usr/share/YaST2/control/control.rng $RPM_BUILD_ROOT/CD1/control.xml
install -m 644 %{SOURCE0} $RPM_BUILD_ROOT/CD1/
%ifarch ppc ppc64
sed -i -e "s,http://download.opensuse.org/distribution/,http://powerpc.opensuse.org/di…," $RPM_BUILD_ROOT/CD1/control.xml
++++++ control.promo.diff ++++++
--- control.xml 2013-09-27 13:58:16.683586483 +0200
+++ control.xml.promo 2013-09-27 13:58:47.389998686 +0200
@@ -188,8 +188,7 @@
<selection_type config:type="symbol">auto</selection_type>
- <!-- warn on older suse -->
+ <!-- basically warn everywhere -->
<products_supported_for_upgrade config:type="list">
- <regexp_item>^openSUSE 12\..*</regexp_item>
- <regexp_item>^openSUSE 13\..*$</regexp_item>
+ <regexp_item>^openSUSE-Promo</regexp_item>
</products_supported_for_upgrade>
++++++ control.xml ++++++
--- /var/tmp/diff_new_pack.xBWK3U/_old 2013-09-29 17:52:19.000000000 +0200
+++ /var/tmp/diff_new_pack.xBWK3U/_new 2013-09-29 17:52:19.000000000 +0200
@@ -187,6 +187,12 @@
<delete_old_packages config:type="boolean">true</delete_old_packages>
<selection_type config:type="symbol">auto</selection_type>
+ <!-- warn on older suse -->
+ <products_supported_for_upgrade config:type="list">
+ <regexp_item>^openSUSE 12\..*</regexp_item>
+ <regexp_item>^openSUSE 13\..*$</regexp_item>
+ </products_supported_for_upgrade>
+
<!-- Bugzilla #327791, if not set, default is true -->
<online_repos_preselected config:type="boolean">false</online_repos_preselected>
@@ -492,10 +498,6 @@
<name>hwinfo</name>
<presentation_order>80</presentation_order>
</proposal_module>
- <proposal_module>
- <name>mouse</name>
- <presentation_order>90</presentation_order>
- </proposal_module>
<!-- software proposal should be computed almost at the end -->
<proposal_module>
<name>software</name>
@@ -532,7 +534,6 @@
<proposal_modules config:type="list">
<proposal_module>hwinfo</proposal_module>
<proposal_module>keyboard</proposal_module>
- <proposal_module>mouse</proposal_module>
<proposal_module>partitions</proposal_module>
<proposal_module>software</proposal_module>
<proposal_module>bootloader</proposal_module>
++++++ pre_checkin.sh ++++++
#! /bin/sh
cp skelcd-control-openSUSE.changes skelcd-control-openSUSE-promo.changes
sed -e 's,^Name.*,Name: skelcd-control-openSUSE-promo,' skelcd-control-openSUSE.spec > skelcd-control-openSUSE-promo.spec
osc service localrun format_spec_file
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package rtkit for openSUSE:13.1 checked in at 2013-09-29 17:52:08
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:13.1/rtkit (Old)
and /work/SRC/openSUSE:13.1/.rtkit.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "rtkit"
Changes:
--------
--- /work/SRC/openSUSE:13.1/rtkit/rtkit.changes 2013-09-23 11:08:08.000000000 +0200
+++ /work/SRC/openSUSE:13.1/.rtkit.new/rtkit.changes 2013-09-29 17:52:09.000000000 +0200
@@ -1,0 +2,6 @@
+Fri Sep 27 22:21:16 UTC 2013 - sreeves(a)suse.com
+
+- Add rtkit-bnc836939.patch
+ Fix bnc#836939 - use of insecure polkit DBUS API. CVE-2013-4326
+
+-------------------------------------------------------------------
New:
----
rtkit-bnc836939.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ rtkit.spec ++++++
--- /var/tmp/diff_new_pack.8my34t/_old 2013-09-29 17:52:09.000000000 +0200
+++ /var/tmp/diff_new_pack.8my34t/_new 2013-09-29 17:52:09.000000000 +0200
@@ -1,7 +1,7 @@
#
# spec file for package rtkit
#
-# 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
@@ -39,6 +39,8 @@
%define has_systemd 1
%endif
Patch0: rtkit-use-system-sd-daemon.patch
+# PATCH-FIX-UPSTREAM rtkit-bnc836939.patch sreeves(a)suse.com -- use of insecure polkit DBUS API
+Patch1: rtkit-bnc836939.patch
%description
RealtimeKit is a D-Bus system service that changes the
@@ -50,6 +52,7 @@
%prep
%setup -q
%patch0 -p1
+%patch1 -p1
%build
autoreconf -fiv
++++++ rtkit-bnc836939.patch ++++++
commit 88d4082ef6caf6b071d749dca1c50e7edde914cc
Author: Colin Walters <walters(a)verbum.org>
Date: Thu Aug 22 16:05:22 2013 -0400
Pass uid of caller to polkit
Otherwise, we force polkit to look up the uid itself in /proc, which
is racy if they execve() a setuid binary.
diff --git a/rtkit-daemon.c b/rtkit-daemon.c
index 2ebe673..3ecc1f7 100644
--- a/rtkit-daemon.c
+++ b/rtkit-daemon.c
@@ -1170,12 +1170,14 @@ static int verify_polkit(DBusConnection *c, struct rtkit_user *u, struct process
DBusMessage *m = NULL, *r = NULL;
const char *unix_process = "unix-process";
const char *pid = "pid";
+ const char *uid = "uid";
const char *start_time = "start-time";
const char *cancel_id = "";
uint32_t flags = 0;
uint32_t pid_u32 = p->pid;
- uint64_t start_time_u64 = p->starttime;
+ uint32_t uid_u32 = (uint32_t)u->uid;
DBusMessageIter iter_msg, iter_struct, iter_array, iter_dict, iter_variant;
+ uint64_t start_time_u64 = p->starttime;
int ret;
dbus_bool_t authorized = FALSE;
@@ -1206,6 +1208,13 @@ static int verify_polkit(DBusConnection *c, struct rtkit_user *u, struct process
assert_se(dbus_message_iter_close_container(&iter_dict, &iter_variant));
assert_se(dbus_message_iter_close_container(&iter_array, &iter_dict));
+ assert_se(dbus_message_iter_open_container(&iter_array, DBUS_TYPE_DICT_ENTRY, NULL, &iter_dict));
+ assert_se(dbus_message_iter_append_basic(&iter_dict, DBUS_TYPE_STRING, &uid));
+ assert_se(dbus_message_iter_open_container(&iter_dict, DBUS_TYPE_VARIANT, "u", &iter_variant));
+ assert_se(dbus_message_iter_append_basic(&iter_variant, DBUS_TYPE_UINT32, &uid_u32));
+ assert_se(dbus_message_iter_close_container(&iter_dict, &iter_variant));
+ assert_se(dbus_message_iter_close_container(&iter_array, &iter_dict));
+
assert_se(dbus_message_iter_close_container(&iter_struct, &iter_array));
assert_se(dbus_message_iter_close_container(&iter_msg, &iter_struct));
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package rtkit for openSUSE:Factory checked in at 2013-09-29 17:52:05
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/rtkit (Old)
and /work/SRC/openSUSE:Factory/.rtkit.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "rtkit"
Changes:
--------
--- /work/SRC/openSUSE:Factory/rtkit/rtkit.changes 2012-10-19 08:51:58.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.rtkit.new/rtkit.changes 2013-09-29 17:52:06.000000000 +0200
@@ -1,0 +2,6 @@
+Fri Sep 27 22:21:16 UTC 2013 - sreeves(a)suse.com
+
+- Add rtkit-bnc836939.patch
+ Fix bnc#836939 - use of insecure polkit DBUS API. CVE-2013-4326
+
+-------------------------------------------------------------------
New:
----
rtkit-bnc836939.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ rtkit.spec ++++++
--- /var/tmp/diff_new_pack.2H90NF/_old 2013-09-29 17:52:06.000000000 +0200
+++ /var/tmp/diff_new_pack.2H90NF/_new 2013-09-29 17:52:06.000000000 +0200
@@ -1,7 +1,7 @@
#
# spec file for package rtkit
#
-# 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
@@ -39,6 +39,8 @@
%define has_systemd 1
%endif
Patch0: rtkit-use-system-sd-daemon.patch
+# PATCH-FIX-UPSTREAM rtkit-bnc836939.patch sreeves(a)suse.com -- use of insecure polkit DBUS API
+Patch1: rtkit-bnc836939.patch
%description
RealtimeKit is a D-Bus system service that changes the
@@ -50,6 +52,7 @@
%prep
%setup -q
%patch0 -p1
+%patch1 -p1
%build
autoreconf -fiv
++++++ rtkit-bnc836939.patch ++++++
commit 88d4082ef6caf6b071d749dca1c50e7edde914cc
Author: Colin Walters <walters(a)verbum.org>
Date: Thu Aug 22 16:05:22 2013 -0400
Pass uid of caller to polkit
Otherwise, we force polkit to look up the uid itself in /proc, which
is racy if they execve() a setuid binary.
diff --git a/rtkit-daemon.c b/rtkit-daemon.c
index 2ebe673..3ecc1f7 100644
--- a/rtkit-daemon.c
+++ b/rtkit-daemon.c
@@ -1170,12 +1170,14 @@ static int verify_polkit(DBusConnection *c, struct rtkit_user *u, struct process
DBusMessage *m = NULL, *r = NULL;
const char *unix_process = "unix-process";
const char *pid = "pid";
+ const char *uid = "uid";
const char *start_time = "start-time";
const char *cancel_id = "";
uint32_t flags = 0;
uint32_t pid_u32 = p->pid;
- uint64_t start_time_u64 = p->starttime;
+ uint32_t uid_u32 = (uint32_t)u->uid;
DBusMessageIter iter_msg, iter_struct, iter_array, iter_dict, iter_variant;
+ uint64_t start_time_u64 = p->starttime;
int ret;
dbus_bool_t authorized = FALSE;
@@ -1206,6 +1208,13 @@ static int verify_polkit(DBusConnection *c, struct rtkit_user *u, struct process
assert_se(dbus_message_iter_close_container(&iter_dict, &iter_variant));
assert_se(dbus_message_iter_close_container(&iter_array, &iter_dict));
+ assert_se(dbus_message_iter_open_container(&iter_array, DBUS_TYPE_DICT_ENTRY, NULL, &iter_dict));
+ assert_se(dbus_message_iter_append_basic(&iter_dict, DBUS_TYPE_STRING, &uid));
+ assert_se(dbus_message_iter_open_container(&iter_dict, DBUS_TYPE_VARIANT, "u", &iter_variant));
+ assert_se(dbus_message_iter_append_basic(&iter_variant, DBUS_TYPE_UINT32, &uid_u32));
+ assert_se(dbus_message_iter_close_container(&iter_dict, &iter_variant));
+ assert_se(dbus_message_iter_close_container(&iter_array, &iter_dict));
+
assert_se(dbus_message_iter_close_container(&iter_struct, &iter_array));
assert_se(dbus_message_iter_close_container(&iter_msg, &iter_struct));
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package python-django-celery for openSUSE:Factory checked in at 2013-09-29 17:51:50
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-django-celery (Old)
and /work/SRC/openSUSE:Factory/.python-django-celery.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-django-celery"
Changes:
--------
--- /work/SRC/openSUSE:Factory/python-django-celery/python-django-celery.changes 2012-10-18 22:02:53.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.python-django-celery.new/python-django-celery.changes 2013-09-29 17:51:52.000000000 +0200
@@ -1,0 +2,16 @@
+Fri Sep 27 14:09:11 UTC 2013 - p.drouand(a)gmail.com
+
+- Update to version 3.0.23
+ + Now depends on celery 3.0.23
+ + ``djcelery.contrib.test_runner`` used naive datetimes
+ resulting in ``RuntimeWarning`` (Issue #242).
+ + Cache backend now compatible with Django 1.5.
+ + DatabaseScheduler: Periodic task admin form now validates args and kwargs.
+ + DatabaseScheduler: IntervalSchedule and CrontabSchedule will now be ordered
+ in a more natural way.
+ + Django Admin monitor: Worker and Task now supports ``extra_context`.
+ + Django Admin monitor: Now properly formats task tracebacks.
+- Use source url as source
+- Replace python-distribute with python-setuptools BuildRequires
+
+-------------------------------------------------------------------
Old:
----
django-celery-3.0.11.tar.bz2
New:
----
django-celery-3.0.23.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-django-celery.spec ++++++
--- /var/tmp/diff_new_pack.hheT0x/_old 2013-09-29 17:51:53.000000000 +0200
+++ /var/tmp/diff_new_pack.hheT0x/_new 2013-09-29 17:51:53.000000000 +0200
@@ -1,7 +1,7 @@
#
# spec file for package python-django-celery
#
-# 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
@@ -15,21 +15,17 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
-
-%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
-%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
-
Name: python-django-celery
-Version: 3.0.11
+Version: 3.0.23
Release: 0
Url: http://celeryproject.org
Summary: Django Celery Integration
License: BSD-3-Clause
Group: Development/Languages/Python
-Source: django-celery-%{version}.tar.bz2
+Source: https://pypi.python.org/packages/source/d/django-celery/django-celery-%{ver…
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: python-devel
-BuildRequires: python-distribute
+BuildRequires: python-setuptools
#BuildRequires: python-Sphinx
#BuildRequires: python-sphinxcontrib-issuetracker
BuildRequires: python-django
@@ -37,12 +33,11 @@
Requires: python-celerymon
Requires: python-django-picklefield
Requires: python-tz
-%if 0%{?suse_version}
-%py_requires
-%if 0%{?suse_version} > 1110
+%if 0%{?suse_version} && 0%{?suse_version} <= 1110
+%{!?python_sitelib: %global python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+%else
BuildArch: noarch
%endif
-%endif
%description
Django-celery provides Celery integration for Django. Using the Django
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package postfixadmin for openSUSE:Factory checked in at 2013-09-29 17:51:41
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/postfixadmin (Old)
and /work/SRC/openSUSE:Factory/.postfixadmin.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "postfixadmin"
Changes:
--------
--- /work/SRC/openSUSE:Factory/postfixadmin/postfixadmin.changes 2013-09-13 14:44:19.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.postfixadmin.new/postfixadmin.changes 2013-09-29 17:51:43.000000000 +0200
@@ -1,0 +2,6 @@
+Sat Sep 28 21:29:37 UTC 2013 - chris(a)computersalat.de
+
+- rework pre section
+ * if useradd -r then groupadd -r, too
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ postfixadmin.spec ++++++
--- /var/tmp/diff_new_pack.tOmxLQ/_old 2013-09-29 17:51:45.000000000 +0200
+++ /var/tmp/diff_new_pack.tOmxLQ/_new 2013-09-29 17:51:45.000000000 +0200
@@ -144,10 +144,10 @@
# %{buildroot}%{_sysconfdir}/apache2/conf.d/
%pre
-getent group vacation >/dev/null || groupadd vacation || :
-getent passwd vacation >/dev/null || useradd -c "Virtual Vacation" -d %{_localstatedir}/spool/vacation -s /sbin/nologin -M -r -g vacation vacation || :
+%{_sbindir}/groupadd -r vacation 2> /dev/null || :
+%{_sbindir}/useradd -c "Virtual Vacation" -d %{_localstatedir}/spool/vacation -s /sbin/nologin -M -r -g vacation vacation 2> /dev/null || :
# fix group for vacation user (if created by older versions (< 2012-02-13) of this package, it was created with group users)
-usermod -g vacation vacation || :
+%{_sbindir}/usermod -g vacation vacation 2> /dev/null || :
#if [ -z "`grep vacation /etc/postfix/master.cf 2>/dev/null`" ]; then
#cat <<'EOF' >>/etc/postfix/master.cf
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package phpMyAdmin for openSUSE:13.1 checked in at 2013-09-29 17:51:20
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:13.1/phpMyAdmin (Old)
and /work/SRC/openSUSE:13.1/.phpMyAdmin.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "phpMyAdmin"
Changes:
--------
--- /work/SRC/openSUSE:13.1/phpMyAdmin/phpMyAdmin.changes 2013-09-23 11:05:33.000000000 +0200
+++ /work/SRC/openSUSE:13.1/.phpMyAdmin.new/phpMyAdmin.changes 2013-09-29 17:51:20.000000000 +0200
@@ -1,0 +2,18 @@
+Sun Sep 29 11:13:39 UTC 2013 - ecsos(a)schirra.net
+
+- update to 4.0.7 (2013-09-23)
+ - sf#3993 Sorting in database overview with statistics doesn't work
+ - bug Handle the situation where PHP_SELF is not set
+ - sf#4080 Overwrite existing file not obeyed
+ - sf#3929 Database-specific privileges are not copied when cloning user
+ - sf#3997 Error handling in case MySQL extension is missing
+ - sf#4089 Moving Columns will alter column definition
+ - sf#4091 Insert ignore option does not work
+ - sf#4090 Downloading BLOB downloads page template
+ - sf#4092 Clicking on table name in view of information_schema redirects to wrong page
+ - sf#4079 Copy Table Add AUTO_INCREMENT value checkbox not working
+ - sf#4088 MySQL server version at index.php incorrect w/ controlhost
+ - sf#4001 Import error: Class 'ImportOds' not found
+ - sf#3986 Missing DROP VIEW button
+
+-------------------------------------------------------------------
Old:
----
phpMyAdmin-4.0.6-all-languages.tar.bz2
New:
----
phpMyAdmin-4.0.7-all-languages.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ phpMyAdmin.spec ++++++
--- /var/tmp/diff_new_pack.kECWoM/_old 2013-09-29 17:51:20.000000000 +0200
+++ /var/tmp/diff_new_pack.kECWoM/_new 2013-09-29 17:51:20.000000000 +0200
@@ -34,7 +34,7 @@
Summary: Administration of MySQL over the web
License: GPL-2.0+
Group: Productivity/Networking/Web/Frontends
-Version: 4.0.6
+Version: 4.0.7
Release: 0
Url: http://www.phpMyAdmin.net
Source0: %{name}-%{version}-all-languages.tar.bz2
++++++ phpMyAdmin-4.0.6-all-languages.tar.bz2 -> phpMyAdmin-4.0.7-all-languages.tar.bz2 ++++++
/work/SRC/openSUSE:13.1/phpMyAdmin/phpMyAdmin-4.0.6-all-languages.tar.bz2 /work/SRC/openSUSE:13.1/.phpMyAdmin.new/phpMyAdmin-4.0.7-all-languages.tar.bz2 differ: char 11, line 1
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package phpMyAdmin for openSUSE:Factory checked in at 2013-09-29 17:51:17
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/phpMyAdmin (Old)
and /work/SRC/openSUSE:Factory/.phpMyAdmin.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "phpMyAdmin"
Changes:
--------
--- /work/SRC/openSUSE:Factory/phpMyAdmin/phpMyAdmin.changes 2013-09-08 11:41:42.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.phpMyAdmin.new/phpMyAdmin.changes 2013-09-29 17:51:19.000000000 +0200
@@ -1,0 +2,18 @@
+Sun Sep 29 11:13:39 UTC 2013 - ecsos(a)schirra.net
+
+- update to 4.0.7 (2013-09-23)
+ - sf#3993 Sorting in database overview with statistics doesn't work
+ - bug Handle the situation where PHP_SELF is not set
+ - sf#4080 Overwrite existing file not obeyed
+ - sf#3929 Database-specific privileges are not copied when cloning user
+ - sf#3997 Error handling in case MySQL extension is missing
+ - sf#4089 Moving Columns will alter column definition
+ - sf#4091 Insert ignore option does not work
+ - sf#4090 Downloading BLOB downloads page template
+ - sf#4092 Clicking on table name in view of information_schema redirects to wrong page
+ - sf#4079 Copy Table Add AUTO_INCREMENT value checkbox not working
+ - sf#4088 MySQL server version at index.php incorrect w/ controlhost
+ - sf#4001 Import error: Class 'ImportOds' not found
+ - sf#3986 Missing DROP VIEW button
+
+-------------------------------------------------------------------
Old:
----
phpMyAdmin-4.0.6-all-languages.tar.bz2
New:
----
phpMyAdmin-4.0.7-all-languages.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ phpMyAdmin.spec ++++++
--- /var/tmp/diff_new_pack.G4ugYX/_old 2013-09-29 17:51:20.000000000 +0200
+++ /var/tmp/diff_new_pack.G4ugYX/_new 2013-09-29 17:51:20.000000000 +0200
@@ -34,7 +34,7 @@
Summary: Administration of MySQL over the web
License: GPL-2.0+
Group: Productivity/Networking/Web/Frontends
-Version: 4.0.6
+Version: 4.0.7
Release: 0
Url: http://www.phpMyAdmin.net
Source0: %{name}-%{version}-all-languages.tar.bz2
++++++ phpMyAdmin-4.0.6-all-languages.tar.bz2 -> phpMyAdmin-4.0.7-all-languages.tar.bz2 ++++++
/work/SRC/openSUSE:Factory/phpMyAdmin/phpMyAdmin-4.0.6-all-languages.tar.bz2 /work/SRC/openSUSE:Factory/.phpMyAdmin.new/phpMyAdmin-4.0.7-all-languages.tar.bz2 differ: char 11, line 1
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package perl-HTML-Tidy for openSUSE:Factory checked in at 2013-09-29 17:50:58
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/perl-HTML-Tidy (Old)
and /work/SRC/openSUSE:Factory/.perl-HTML-Tidy.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "perl-HTML-Tidy"
Changes:
--------
--- /work/SRC/openSUSE:Factory/perl-HTML-Tidy/perl-HTML-Tidy.changes 2012-12-08 15:52:42.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.perl-HTML-Tidy.new/perl-HTML-Tidy.changes 2013-09-29 17:50:59.000000000 +0200
@@ -1,0 +2,12 @@
+Thu Sep 26 08:31:21 UTC 2013 - pgajdos(a)suse.com
+
+- updated to 1.56
+ * webtidy's version statement now shows the version number of
+ the underlying tidyp library.
+ * Fixed an undef warning in parse(). Thanks, Vladimir Timofeev.
+ * utf8 was never encoded correctly. Thanks, Vladimir Timofeev
+ and Alistair Francis.
+ * The ->parse() method would sometimes return false even though
+ everything worked fine. Thanks, @sebaer.
+
+-------------------------------------------------------------------
Old:
----
HTML-Tidy-1.54.tar.gz
New:
----
HTML-Tidy-1.56.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ perl-HTML-Tidy.spec ++++++
--- /var/tmp/diff_new_pack.LYwcIT/_old 2013-09-29 17:51:02.000000000 +0200
+++ /var/tmp/diff_new_pack.LYwcIT/_new 2013-09-29 17:51:02.000000000 +0200
@@ -1,7 +1,7 @@
#
# spec file for package perl-HTML-Tidy
#
-# 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
@@ -17,7 +17,7 @@
Name: perl-HTML-Tidy
-Version: 1.54
+Version: 1.56
Release: 0
%define cpan_name HTML-Tidy
Summary: (X)HTML validation in a Perl object
++++++ HTML-Tidy-1.54.tar.gz -> HTML-Tidy-1.56.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/HTML-Tidy-1.54/Changes new/HTML-Tidy-1.56/Changes
--- old/HTML-Tidy-1.54/Changes 2010-09-17 07:45:20.000000000 +0200
+++ new/HTML-Tidy-1.56/Changes 2013-09-22 23:39:51.000000000 +0200
@@ -1,5 +1,22 @@
Revision history for Perl extension HTML::Tidy.
+1.56 Sun Sep 22 16:39:40 CDT 2013
+====================================
+[ENHANCEMENTS]
+webtidy's version statement now shows the version number of the underlying
+tidyp library.
+
+[FIXES]
+Fixed an undef warning in parse(). Thanks, Vladimir Timofeev.
+
+utf8 was never encoded correctly. Thanks, Vladimir Timofeev and Alistair
+Francis.
+
+The ->parse() method would sometimes return false even though everything
+worked fine. Thanks, @sebaer.
+
+
+
1.54 Fri Sep 17 00:44:36 CDT 2010
====================================
Please note that the bug tracker for HTML::Tidy is now at
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/HTML-Tidy-1.54/MANIFEST new/HTML-Tidy-1.56/MANIFEST
--- old/HTML-Tidy-1.54/MANIFEST 2010-09-17 07:47:11.000000000 +0200
+++ new/HTML-Tidy-1.56/MANIFEST 2013-09-23 00:33:18.000000000 +0200
@@ -26,6 +26,7 @@
t/too-many-titles.t
t/unicode.html
t/unicode.t
+t/unicode-nbsp.t
t/venus.cfg
t/venus.html
t/venus.t
@@ -33,4 +34,5 @@
t/wordwrap.cfg
t/wordwrap.t
Tidy.xs
-META.yml Module meta-data (added by MakeMaker)
+META.yml Module YAML meta-data (added by MakeMaker)
+META.json Module JSON meta-data (added by MakeMaker)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/HTML-Tidy-1.54/META.json new/HTML-Tidy-1.56/META.json
--- old/HTML-Tidy-1.54/META.json 1970-01-01 01:00:00.000000000 +0100
+++ new/HTML-Tidy-1.56/META.json 2013-09-23 00:33:18.000000000 +0200
@@ -0,0 +1,59 @@
+{
+ "abstract" : "(X)HTML validation in a Perl object",
+ "author" : [
+ "Andy Lester <andy(a)petdance.com>"
+ ],
+ "dynamic_config" : 1,
+ "generated_by" : "ExtUtils::MakeMaker version 6.62, CPAN::Meta::Converter version 2.112621",
+ "license" : [
+ "artistic_2"
+ ],
+ "meta-spec" : {
+ "url" : "http://search.cpan.org/perldoc?CPAN::Meta::Spec",
+ "version" : "2"
+ },
+ "name" : "HTML-Tidy",
+ "no_index" : {
+ "directory" : [
+ "t",
+ "inc"
+ ]
+ },
+ "prereqs" : {
+ "build" : {
+ "requires" : {
+ "ExtUtils::MakeMaker" : 0
+ }
+ },
+ "configure" : {
+ "requires" : {
+ "ExtUtils::MakeMaker" : 0
+ }
+ },
+ "runtime" : {
+ "requires" : {
+ "Carp" : 0,
+ "Exporter" : 0,
+ "Test::Builder" : 0,
+ "Test::More" : "0.98",
+ "constant" : 0,
+ "overload" : 0,
+ "perl" : "5.008"
+ }
+ }
+ },
+ "release_status" : "stable",
+ "resources" : {
+ "bugtracker" : {
+ "web" : "http://github.com/petdance/html-tidy/issues"
+ },
+ "homepage" : "http://github.com/petdance/html-tidy",
+ "license" : [
+ "http://www.opensource.org/licenses/artistic-license-2.0.php"
+ ],
+ "repository" : {
+ "url" : "http://github.com/petdance/html-tidy"
+ }
+ },
+ "version" : "1.56"
+}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/HTML-Tidy-1.54/META.yml new/HTML-Tidy-1.56/META.yml
--- old/HTML-Tidy-1.54/META.yml 2010-09-17 07:47:11.000000000 +0200
+++ new/HTML-Tidy-1.56/META.yml 2013-09-23 00:33:18.000000000 +0200
@@ -1,33 +1,33 @@
---- #YAML:1.0
-name: HTML-Tidy
-version: 1.54
-abstract: (X)HTML validation in a Perl object
+---
+abstract: '(X)HTML validation in a Perl object'
author:
- - Andy Lester <andy(a)petdance.com>
-license: artistic_2
-distribution_type: module
-configure_requires:
- ExtUtils::MakeMaker: 0
+ - 'Andy Lester <andy(a)petdance.com>'
build_requires:
- ExtUtils::MakeMaker: 0
+ ExtUtils::MakeMaker: 0
+configure_requires:
+ ExtUtils::MakeMaker: 0
+dynamic_config: 1
+generated_by: 'ExtUtils::MakeMaker version 6.62, CPAN::Meta::Converter version 2.112621'
+license: artistic_2
+meta-spec:
+ url: http://module-build.sourceforge.net/META-spec-v1.4.html
+ version: 1.4
+name: HTML-Tidy
+no_index:
+ directory:
+ - t
+ - inc
requires:
- Carp: 0
- constant: 0
- Exporter: 0
- overload: 0
- perl: 5.008
- Test::Builder: 0
- Test::More: 0
+ Carp: 0
+ Exporter: 0
+ Test::Builder: 0
+ Test::More: 0.98
+ constant: 0
+ overload: 0
+ perl: 5.008
resources:
- bugtracker: http://github.com/petdance/html-tidy/issues
- homepage: http://github.com/petdance/html-tidy
- license: http://www.opensource.org/licenses/artistic-license-2.0.php
- Repository: http://github.com/petdance/html-tidy
-no_index:
- directory:
- - t
- - inc
-generated_by: ExtUtils::MakeMaker version 6.56
-meta-spec:
- url: http://module-build.sourceforge.net/META-spec-v1.4.html
- version: 1.4
+ bugtracker: http://github.com/petdance/html-tidy/issues
+ homepage: http://github.com/petdance/html-tidy
+ license: http://www.opensource.org/licenses/artistic-license-2.0.php
+ repository: http://github.com/petdance/html-tidy
+version: 1.56
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/HTML-Tidy-1.54/Makefile.PL new/HTML-Tidy-1.56/Makefile.PL
--- old/HTML-Tidy-1.54/Makefile.PL 2010-09-17 07:45:59.000000000 +0200
+++ new/HTML-Tidy-1.56/Makefile.PL 2013-09-22 23:58:55.000000000 +0200
@@ -31,15 +31,13 @@
It seems that you don't have tidyp installed. HTML::Tidy does no
real work on its own. It's just a wrapper aound tidyp.
-HTML::Tidy is only tested to work with tidyp hosted at
-http://github.com/petdance/tidyp. This is mostly the same as the one
-at http://tidy.sourceforge.net/, with some changes, such as adding a
-version number so that we can tell what version we're working with.
+Please read the README.markdown file for details on how to install.
-If you do have tidyp installed, and I just haven't detected it,
+If you do have tidyp installed, but Makefile.PL can't detect it,
go ahead and try building. If HTML::Tidy builds and tests correctly,
-then please let Andy Lester know at andy(a)petdance.com so that he can
-fix the library detection code.
+please file a ticket at Github at
+http://github.com/petdance/html-tidy/issues. so we can fix the
+library detection code.
EOF
}
@@ -63,7 +61,7 @@
ABSTRACT_FROM => 'lib/HTML/Tidy.pm',
PREREQ_PM => {
'Exporter' => 0,
- 'Test::More' => 0,
+ 'Test::More' => '0.98', # For subtest()
'Test::Builder' => 0,
'Carp' => 0,
'overload' => 0,
@@ -85,10 +83,10 @@
license => 'http://www.opensource.org/licenses/artistic-license-2.0.php',
homepage => 'http://github.com/petdance/html-tidy',
bugtracker => 'http://github.com/petdance/html-tidy/issues',
- Repository => 'http://github.com/petdance/html-tidy',
+ repository => 'http://github.com/petdance/html-tidy',
}
};
- $parms->{LICENSE} = 'artistic_2',
+ $parms->{LICENSE} = 'artistic_2';
}
if ( $ExtUtils::MakeMaker::VERSION ge '6.47_02' ) {
$parms->{MIN_PERL_VERSION} = 5.008;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/HTML-Tidy-1.54/README.markdown new/HTML-Tidy-1.56/README.markdown
--- old/HTML-Tidy-1.54/README.markdown 2010-09-17 06:42:59.000000000 +0200
+++ new/HTML-Tidy-1.56/README.markdown 2012-07-07 06:08:57.000000000 +0200
@@ -1,23 +1,37 @@
HTML::Tidy
==========
HTML::Tidy is an HTML checker in a handy dandy object. It's meant as
-a replacement for HTML::Lint.
+a replacement for [HTML::Lint] [1], which is written in Perl but is not
+nearly as capable as HTML::Tidy.
-INSTALLING TIDYP
-================
-You need the tidyp library to build HTML::Tidy. If you
-haven't installed it, you can get a source distribution at
-[Github](http://github.com/petdance/tidyp/downloads).
+PREREQUISITES
+=============
+HTML::Tidy does very little work. The real work of HTML::Tidy is
+done by the tidyp library, which is written in C. To use HTML::Tidy,
+you must install tidyp.
-You can also try installing the CPAN module Alien::Tidyp, which
-encapsulates the tidyp installation.
+There are two, perhaps three, ways to install tidyp:
+
+* Get a tarball from the [tidyp source distributions] [2] from
+Github and and build it like any other C library. Note that you
+must get a source tarball, *not* just clone the source tree via
+github.
+
+* Install the [Alien::Tidyp] [3] Perl module, which automates the
+tidyp installation process.
+
+* Your operating system may also have a package for tidyp that you
+can install. I am not aware of any packages at this writing, but
+they could still exist without me knowing.
+
+You need only do one of these steps.
INSTALLATION
============
-Once you have libtidyp installed, install HTML::Tidy like any standard
-Perl module.
+Once you have libtidyp installed via one of the previous methods,
+install HTML::Tidy like any standard Perl module.
perl Makefile.PL
make
@@ -31,3 +45,7 @@
This library is free software. It may be redistributed and modified
under the Artistic License v2.0.
+
+ [1]: http://search.cpan.org/dist/HTML-Lint/ "HTML::Lint"
+ [2]: http://github.com/petdance/tidyp/downloads "tidyp source distributions"
+ [3]: http://search.cpan.org/dist/Alien-Tidyp/ "Alien::Tidyp"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/HTML-Tidy-1.54/Tidy.xs new/HTML-Tidy-1.56/Tidy.xs
--- old/HTML-Tidy-1.54/Tidy.xs 2010-09-17 05:13:22.000000000 +0200
+++ new/HTML-Tidy-1.56/Tidy.xs 2012-07-07 06:15:19.000000000 +0200
@@ -137,11 +137,11 @@
}
if ( rc >= 0 ) {
- rc = tidySetErrorBuffer( tdoc, &errbuf ); // Capture diagnostics
+ rc = tidySetErrorBuffer( tdoc, &errbuf ); /* Capture diagnostics */
}
if ( rc >= 0 ) {
- rc = tidyParseString( tdoc, input ); // Parse the input
+ rc = tidyParseString( tdoc, input ); /* Parse the input */
}
if ( rc >= 0 ) {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/HTML-Tidy-1.54/bin/webtidy new/HTML-Tidy-1.56/bin/webtidy
--- old/HTML-Tidy-1.54/bin/webtidy 2010-09-17 05:13:22.000000000 +0200
+++ new/HTML-Tidy-1.56/bin/webtidy 2013-09-22 23:43:57.000000000 +0200
@@ -9,17 +9,17 @@
my $help;
my $context;
-my $tidy = new HTML::Tidy;
+my $tidy = HTML::Tidy->new;
GetOptions(
- 'help' => \$help,
+ 'help|version' => \$help,
'context:i' => \$context,
'noerrors' => sub { $tidy->ignore( type => [ TIDY_ERROR ] ) },
'nowarnings' => sub { $tidy->ignore( type => [ TIDY_WARNING ] ) },
) or $help = 1;
if ( !@ARGV || $help ) {
- print "webtidy v$HTML::Tidy::VERSION\n";
+ print "webtidy v$HTML::Tidy::VERSION using tidyp v" . HTML::Tidy::tidyp_version() . "\n";
print <DATA>;
exit 1;
}
@@ -28,8 +28,7 @@
for my $url ( @ARGV ) {
my @lines;
if ( $url =~ /^https?:/ ) {
- eval { require LWP::Simple };
- if ( $@ ) {
+ if ( !eval { require LWP::Simple; 1; } ) {
warn q{Can't retrieve URLs without LWP::Simple installed};
next;
}
@@ -77,3 +76,6 @@
--nowarnings Ignore warnings
--help This message
+
+webtidy is free software. You may modify or distribute it under the
+terms of the Artistic License v2.0.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/HTML-Tidy-1.54/lib/HTML/Tidy/Message.pm new/HTML-Tidy-1.56/lib/HTML/Tidy/Message.pm
--- old/HTML-Tidy-1.54/lib/HTML/Tidy/Message.pm 2010-09-17 05:13:22.000000000 +0200
+++ new/HTML-Tidy-1.56/lib/HTML/Tidy/Message.pm 2013-09-22 23:13:50.000000000 +0200
@@ -137,12 +137,12 @@
sub text { my $self = shift; return $self->{_text} }
-=head1 LICENSE
+=head1 COPYRIGHT & LICENSE
-This code may be distributed under the same terms as Perl itself.
+Copyright 2005-2013 Andy Lester.
-Please note that these modules are not products of or supported by the
-employers of the various contributors to the code.
+This program is free software; you can redistribute it and/or modify
+it under the terms of the Artistic License v2.0.
=head1 AUTHOR
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/HTML-Tidy-1.54/lib/HTML/Tidy.pm new/HTML-Tidy-1.56/lib/HTML/Tidy.pm
--- old/HTML-Tidy-1.54/lib/HTML/Tidy.pm 2010-09-17 07:35:19.000000000 +0200
+++ new/HTML-Tidy-1.56/lib/HTML/Tidy.pm 2013-09-23 00:01:17.000000000 +0200
@@ -13,18 +13,18 @@
=head1 VERSION
-Version 1.54
+Version 1.56
=cut
-our $VERSION = '1.54';
+our $VERSION = '1.56';
=head1 SYNOPSIS
use HTML::Tidy;
my $tidy = HTML::Tidy->new( {config_file => 'path/to/config'} );
- $tidy->ignore( type => TIDY_WARNING, typed => TIDY_INFO );
+ $tidy->ignore( type => TIDY_WARNING, type => TIDY_INFO );
$tidy->parse( "foo.html", $contents_of_foo );
for my $message ( $tidy->messages ) {
@@ -223,14 +223,12 @@
}
my $html = join( '', @_ );
- utf8::encode($html) unless utf8::is_utf8($html);
- my ($errorblock,$newline) = _tidy_messages( $html,
- $self->{config_file},
- $self->{tidy_options}
- );
+ utf8::encode($html) if utf8::is_utf8($html);
+ my ($errorblock,$newline) = _tidy_messages( $html, $self->{config_file}, $self->{tidy_options} );
+ return 1 unless defined $errorblock;
+
utf8::decode($errorblock);
- return unless defined $errorblock;
return !$self->_parse_errors($filename, $errorblock, $newline);
}
@@ -308,7 +306,7 @@
}
my $text = join( '', @_ );
- utf8::encode($text) unless utf8::is_utf8($text);
+ utf8::encode($text) if utf8::is_utf8($text);
if ( defined $text ) {
$text .= "\n";
}
@@ -352,7 +350,7 @@
=cut
# backcompat
-sub libtidyp_version { shift->tidyp_version }
+sub libtidyp_version { return shift->tidyp_version }
sub tidyp_version {
my $version_str = _tidyp_version();
@@ -369,14 +367,14 @@
=head1 INSTALLING TIDYP
-L<HTML::Tidy|HTML::Tidy> requires that C<tidyp> be installed on your system.
+C<HTML::Tidy> requires that C<tidyp> be installed on your system.
You can obtain tidyp through your distribution's package manager
(make sure you install the development package with headers), or from
the tidyp Git repository at L<http://github.com/petdance/tidyp>.
=head1 CONVERTING FROM C<HTML::Lint>
-L<HTML::Tidy|HTML::Tidy> is different from L<HTML::Lint|HTML::Lint> in a number of crucial ways.
+C<HTML::Tidy> is different from C<HTML::Lint> in a number of crucial ways.
=over 4
@@ -449,7 +447,7 @@
=head1 COPYRIGHT & LICENSE
-Copyright (C) 2005-2010 by Andy Lester
+Copyright (C) 2005-2013 by Andy Lester
This library is free software. You mean modify or distribute it under
the Artistic License v2.0.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/HTML-Tidy-1.54/perlcriticrc new/HTML-Tidy-1.56/perlcriticrc
--- old/HTML-Tidy-1.54/perlcriticrc 2010-09-17 05:13:22.000000000 +0200
+++ new/HTML-Tidy-1.56/perlcriticrc 2013-09-23 00:14:59.000000000 +0200
@@ -1,20 +1,35 @@
[-CodeLayout::ProhibitParensWithBuiltins]
[CodeLayout::ProhibitHardTabs]
allow_leading_tabs = 0
+[-CodeLayout::RequireTidyCode]
+# Never works for me.
+
+[Compatibility::PodMinimumVersion]
+above_version = 5.008008
[-ControlStructures::ProhibitPostfixControls]
+[-Documentation::PodSpelling]
[-Documentation::RequirePodAtEnd]
[-Documentation::RequirePodSections]
+[-InputOutput::RequireCheckedSyscalls]
+functions = open opendir read readline readdir close closedir
+
[-Miscellanea::RequireRcsKeywords]
[-Modules::RequireVersionVar]
+[-RegularExpressions::ProhibitEscapedMetacharacters]
+[-RegularExpressions::RequireDotMatchAnything]
[-RegularExpressions::RequireExtendedFormatting]
[-RegularExpressions::RequireLineBoundaryMatching]
+[Subroutines::RequireArgUnpacking]
+
[-ValuesAndExpressions::ProhibitConstantPragma]
+[-ValuesAndExpressions::ProhibitNoisyQuotes]
[-ValuesAndExpressions::ProhibitEmptyQuotes]
+[-ValuesAndExpressions::ProhibitMagicNumbers]
[-Variables::ProhibitPunctuationVars]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/HTML-Tidy-1.54/t/00-load.t new/HTML-Tidy-1.56/t/00-load.t
--- old/HTML-Tidy-1.54/t/00-load.t 2010-09-17 05:21:10.000000000 +0200
+++ new/HTML-Tidy-1.56/t/00-load.t 2013-09-22 22:57:22.000000000 +0200
@@ -1,16 +1,12 @@
-#!perl -Tw
+#!perl -T
use strict;
use warnings;
-use Test::More tests => 2;
-BEGIN {
- use_ok( 'HTML::Tidy' );
-}
-BEGIN {
- use_ok( 'HTML::Tidy::Message' );
-}
-eval {
- # For better test reporting
- diag( "Testing HTML::Tidy $HTML::Tidy::VERSION, Perl $]; tidyp " . HTML::Tidy->tidyp_version() );
-}
+use Test::More tests => 1;
+
+use HTML::Tidy;
+use HTML::Tidy::Message;
+
+diag( "Testing HTML::Tidy $HTML::Tidy::VERSION, Perl $]; tidyp " . HTML::Tidy->tidyp_version() );
+pass( 'Modules loaded' );
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/HTML-Tidy-1.54/t/cfg-for-parse.t new/HTML-Tidy-1.56/t/cfg-for-parse.t
--- old/HTML-Tidy-1.54/t/cfg-for-parse.t 2010-09-17 05:13:22.000000000 +0200
+++ new/HTML-Tidy-1.56/t/cfg-for-parse.t 2013-09-22 23:35:05.000000000 +0200
@@ -1,12 +1,11 @@
-#!perl -Tw
+#!perl -T
use warnings;
use strict;
+
use Test::More tests => 3;
-BEGIN {
- use_ok( 'HTML::Tidy' );
-}
+use HTML::Tidy;
my $html = do { local $/; <DATA> };
@@ -19,10 +18,11 @@
chomp @expected_messages;
shift @expected_messages; # First one's blank
-my $tidy = new HTML::Tidy({config_file => 't/cfg-for-parse.cfg' });
+my $tidy = HTML::Tidy->new( { config_file => 't/cfg-for-parse.cfg' } );
isa_ok( $tidy, 'HTML::Tidy' );
-$tidy->parse( 'DATA', $html );
+my $rc = $tidy->parse( 'DATA', $html );
+ok( $rc, 'Parsed OK' );
my @returned = map { $_->as_string } $tidy->messages;
s/[\r\n]+\z// for @returned;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/HTML-Tidy-1.54/t/clean-crash.t new/HTML-Tidy-1.56/t/clean-crash.t
--- old/HTML-Tidy-1.54/t/clean-crash.t 2010-09-17 05:13:22.000000000 +0200
+++ new/HTML-Tidy-1.56/t/clean-crash.t 2013-09-22 22:57:22.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -Tw
+#!/usr/bin/perl -T
use warnings;
use strict;
@@ -8,17 +8,13 @@
#<URL: https://rt.cpan.org/Ticket/Display.html?id=7254 >
#Here's a snippet of code to repro the bug, it produces an 'Illegal instruction' error
-use Test::More tests=>3;
+use Test::More tests => 2;
-BEGIN {
- use_ok( 'HTML::Tidy' );
-}
-
-use strict;
+use HTML::Tidy;
my $html = do { local $/; <DATA> };
-my $tidy = new HTML::Tidy;
+my $tidy = HTML::Tidy->new;
isa_ok( $tidy, 'HTML::Tidy' );
$tidy->ignore( type => TIDY_INFO );
$tidy->clean( $html );
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/HTML-Tidy-1.54/t/extra-quote.t new/HTML-Tidy-1.56/t/extra-quote.t
--- old/HTML-Tidy-1.54/t/extra-quote.t 2010-09-17 05:13:22.000000000 +0200
+++ new/HTML-Tidy-1.56/t/extra-quote.t 2013-09-22 23:35:10.000000000 +0200
@@ -1,4 +1,4 @@
-#!perl -Tw
+#!perl -T
use warnings;
use strict;
@@ -8,7 +8,7 @@
use Test::More tests => 4;
-BEGIN { use_ok( 'HTML::Tidy' ); }
+use HTML::Tidy;
my $html = do { local $/ = undef; <DATA> };
@@ -16,7 +16,8 @@
isa_ok( $tidy, 'HTML::Tidy' );
$tidy->ignore( text => qr/DOCTYPE/ );
-$tidy->parse( '-', $html );
+my $rc = $tidy->parse( '-', $html );
+ok( $rc, 'Parsed OK' );
my @expected = split /\n/, q{
- (4:1) Warning: <img> unexpected or duplicate quote mark
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/HTML-Tidy-1.54/t/ignore-text.t new/HTML-Tidy-1.56/t/ignore-text.t
--- old/HTML-Tidy-1.54/t/ignore-text.t 2010-09-17 05:13:22.000000000 +0200
+++ new/HTML-Tidy-1.56/t/ignore-text.t 2013-09-23 00:20:45.000000000 +0200
@@ -1,12 +1,11 @@
-#!perl -Tw
+#!perl -T
use warnings;
use strict;
+
use Test::More tests => 3;
-BEGIN {
- use_ok( 'HTML::Tidy' );
-}
+use HTML::Tidy;
my $html = do { local $/; <DATA> };
@@ -19,13 +18,14 @@
shift @expected_messages; # First one's blank
IGNORE_BOGOTAG: {
- my $tidy = new HTML::Tidy;
+ my $tidy = HTML::Tidy->new;
isa_ok( $tidy, 'HTML::Tidy' );
$tidy->ignore( text => qr/bogotag/ );
$tidy->ignore( text => [ qr/UNESCAPED/, qr/doctype/i ] );
# The qr/UNESCAPED/ should not ignore anything because there's no /i
- $tidy->parse( 'DATA', $html );
+ my $rc = $tidy->parse( 'DATA', $html );
+ ok( $rc, 'Parsed OK' );
my @returned = map { $_->as_string } $tidy->messages;
munge_returned( \@returned, 'DATA' );
@@ -36,10 +36,11 @@
sub munge_returned {
# non-1 line numbers are not reliable across libtidies
my $returned = shift;
- my $start_line = shift || qq{-};
- for ( my $i = 0; $i < scalar @{$returned}; $i++ ) {
- next if $returned->[$i] =~ m/$start_line \(\d+:1\)/;
- $returned->[$i] =~ s/$start_line \((\d+):(\d+)\)/$start_line ($1:XX)/;
+ my $start_line = shift || '-';
+
+ for my $line ( @{$returned} ) {
+ next if $line =~ m/$start_line \(\d+:1\)/;
+ $line =~ s/$start_line \((\d+):(\d+)\)/$start_line ($1:XX)/;
}
}
__DATA__
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/HTML-Tidy-1.54/t/ignore.t new/HTML-Tidy-1.56/t/ignore.t
--- old/HTML-Tidy-1.54/t/ignore.t 2010-09-17 05:13:22.000000000 +0200
+++ new/HTML-Tidy-1.56/t/ignore.t 2013-09-23 00:20:07.000000000 +0200
@@ -1,10 +1,11 @@
-#!perl -Tw
+#!perl -T
use strict;
use warnings;
-use Test::More tests => 7;
-BEGIN { use_ok( 'HTML::Tidy' ); }
+use Test::More tests => 9;
+
+use HTML::Tidy;
my $html = do { local $/ = undef; <DATA> };
@@ -24,11 +25,12 @@
shift @expected_errors; # First one's blank
WARNINGS_ONLY: {
- my $tidy = new HTML::Tidy;
+ my $tidy = HTML::Tidy->new;
isa_ok( $tidy, 'HTML::Tidy' );
$tidy->ignore( type => TIDY_ERROR );
- $tidy->parse( '-', $html );
+ my $rc = $tidy->parse( '-', $html );
+ ok( $rc, 'Parsed OK' );
my @returned = map { $_->as_string } $tidy->messages;
s/[\r\n]+\z// for @returned;
@@ -37,11 +39,12 @@
}
ERRORS_ONLY: {
- my $tidy = new HTML::Tidy;
+ my $tidy = HTML::Tidy->new;
isa_ok( $tidy, 'HTML::Tidy' );
$tidy->ignore( type => TIDY_WARNING );
- $tidy->parse( '-', $html );
+ my $rc = $tidy->parse( '-', $html );
+ ok( $rc, 'Parsed OK' );
my @returned = map { $_->as_string } $tidy->messages;
s/[\r\n]+\z// for @returned;
@@ -49,20 +52,22 @@
}
DIES_ON_ERROR: {
- my $tidy = new HTML::Tidy;
+ my $tidy = HTML::Tidy->new;
isa_ok( $tidy, 'HTML::Tidy' );
- eval { $tidy->ignore( blongo => TIDY_WARNING ) };
+ my $rc = eval { $tidy->ignore( blongo => TIDY_WARNING ) };
+ ok( !$rc, 'eval should fail' );
like( $@, qr/^Invalid ignore type.+blongo/, 'Throws an error' );
}
sub munge_returned {
# non-1 line numbers are not reliable across libtidies
my $returned = shift;
- my $start_line = shift || qq{-};
- for ( my $i = 0; $i < scalar @{$returned}; $i++ ) {
- next if $returned->[$i] =~ m/$start_line \(\d+:1\)/;
- $returned->[$i] =~ s/$start_line \((\d+):(\d+)\)/$start_line ($1:XX)/;
+ my $start_line = shift || '-';
+
+ for my $line ( @{$returned} ) {
+ next if $line =~ /$start_line \(\d+:1\)/;
+ $line =~ s/$start_line \((\d+):(\d+)\)/$start_line ($1:XX)/;
}
}
__DATA__
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/HTML-Tidy-1.54/t/levels.t new/HTML-Tidy-1.56/t/levels.t
--- old/HTML-Tidy-1.54/t/levels.t 2010-09-17 05:13:22.000000000 +0200
+++ new/HTML-Tidy-1.56/t/levels.t 2013-09-23 00:21:27.000000000 +0200
@@ -1,16 +1,16 @@
-#!perl -Tw
+#!perl -T
use warnings;
use strict;
+
use Test::More tests => 3;
-BEGIN {
- use_ok( 'HTML::Tidy' );
-}
+use HTML::Tidy;
-my $tidy = new HTML::Tidy;
+my $tidy = HTML::Tidy->new;
isa_ok( $tidy, 'HTML::Tidy' );
-$tidy->parse( '-', <DATA> );
+my $rc = $tidy->parse( '-', <DATA> );
+ok( $rc, 'Parsed OK' );
my @expected = split /\n/, q{
- (1:1) Warning: missing <!DOCTYPE> declaration
@@ -30,11 +30,14 @@
sub munge_returned {
# non-1 line numbers are not reliable across libtidies
my $returned = shift;
- my $start_line = shift || qq{-};
- for ( my $i = 0; $i < scalar @{$returned}; $i++ ) {
- next if $returned->[$i] =~ m/$start_line \(\d+:1\)/;
- $returned->[$i] =~ s/$start_line \((\d+):(\d+)\)/$start_line ($1:XX)/;
+ my $start_line = shift || '-';
+
+ for my $line ( @{$returned} ) {
+ next if $line =~ /$start_line \(\d+:1\)/;
+ $line =~ s/$start_line \((\d+):(\d+)\)/$start_line ($1:XX)/;
}
+
+ return;
}
__DATA__
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/HTML-Tidy-1.54/t/message.t new/HTML-Tidy-1.56/t/message.t
--- old/HTML-Tidy-1.54/t/message.t 2010-09-17 05:13:22.000000000 +0200
+++ new/HTML-Tidy-1.56/t/message.t 2013-09-23 00:24:21.000000000 +0200
@@ -1,12 +1,12 @@
-#!perl -Tw
+#!perl -T
use warnings;
use strict;
-use Test::More tests => 16;
+use Test::More tests => 4;
-BEGIN { use_ok( 'HTML::Tidy' ); }
-BEGIN { use_ok( 'HTML::Tidy::Message' ); }
+use HTML::Tidy;
+use HTML::Tidy::Message;
WITH_LINE_NUMBERS: {
my $error = HTML::Tidy::Message->new( 'foo.pl', TIDY_ERROR, 2112, 5150, 'Blah blah' );
@@ -20,7 +20,7 @@
text => 'Blah blah',
as_string => 'foo.pl (2112:5150) Error: Blah blah',
);
- _match_up( $error, %expected );
+ _match_up( $error, \%expected, 'With line numbers' );
}
WITHOUT_LINE_NUMBERS: {
@@ -35,15 +35,21 @@
text => 'Blah blah',
as_string => 'bar.pl - Warning: Blah blah',
);
- _match_up( $error, %expected );
+ _match_up( $error, \%expected, 'Without line numbers' );
}
sub _match_up {
- my $error = shift;
- my %expected = @_;
-
local $Test::Builder::Level = $Test::Builder::Level + 1;
- for my $what ( sort keys %expected ) {
- is( $error->$what, $expected{$what}, "$what matches" );
- }
+
+ my $error = shift;
+ my $expected = shift;
+ my $msg = shift or die;
+
+ return subtest "_matchup( $msg )" => sub {
+ plan tests => scalar keys %{$expected};
+
+ for my $what ( sort keys %{$expected} ) {
+ is( $error->$what, $expected->{$what}, "$what matches" );
+ }
+ };
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/HTML-Tidy-1.54/t/opt-00.t new/HTML-Tidy-1.56/t/opt-00.t
--- old/HTML-Tidy-1.54/t/opt-00.t 2010-09-17 05:13:22.000000000 +0200
+++ new/HTML-Tidy-1.56/t/opt-00.t 2013-09-22 22:57:22.000000000 +0200
@@ -1,15 +1,13 @@
-#!perl -Tw
+#!perl -T
use warnings;
use strict;
-use Test::More;
-BEGIN {
- plan tests => 2;
- use_ok( 'HTML::Tidy' );
-}
+use Test::More tests => 1;
-my $tidy = new HTML::Tidy({
+use HTML::Tidy;
+
+my $tidy = HTML::Tidy->new({
tidy_mark => 0,
add_xml_decl => 1,
output_xhtml => 1,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/HTML-Tidy-1.54/t/perfect.t new/HTML-Tidy-1.56/t/perfect.t
--- old/HTML-Tidy-1.54/t/perfect.t 2010-09-17 05:13:22.000000000 +0200
+++ new/HTML-Tidy-1.56/t/perfect.t 2013-09-23 00:10:49.000000000 +0200
@@ -1,23 +1,25 @@
-#!perl -Tw
+#!perl -T
use warnings;
use strict;
+
use Test::More tests => 3;
-BEGIN { use_ok( 'HTML::Tidy' ); }
+use HTML::Tidy;
my $html = join '', <DATA>;
# No errors at all.
-my $tidy = new HTML::Tidy;
+my $tidy = HTML::Tidy->new;
isa_ok( $tidy, 'HTML::Tidy' );
$tidy->ignore( type => TIDY_INFO );
-$tidy->parse( '-', $html );
+my $rc = $tidy->parse( '-', $html );
+ok( $rc, 'Parsed OK' );
my @returned = map { $_->as_string } $tidy->messages;
-is( scalar @returned, 0, 'Should have no messages' );
+is_deeply( \@returned, [], 'Should have no messages' );
# User reported a segfault when there are no messages. By gum, he was
# right.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/HTML-Tidy-1.54/t/roundtrip.t new/HTML-Tidy-1.56/t/roundtrip.t
--- old/HTML-Tidy-1.54/t/roundtrip.t 2010-09-17 05:13:22.000000000 +0200
+++ new/HTML-Tidy-1.56/t/roundtrip.t 2013-09-23 00:10:23.000000000 +0200
@@ -1,12 +1,11 @@
-#!perl -Tw
+#!perl -T
use warnings;
use strict;
-use Test::More tests => 4;
-BEGIN {
- use_ok( 'HTML::Tidy' );
-}
+use Test::More tests => 3;
+
+use HTML::Tidy;
my $args = { newline => 'Lf' };
my $tidy = HTML::Tidy->new($args);
@@ -24,8 +23,7 @@
$clean = $tidy->clean($clean);
my @messages = $tidy->messages( $clean );
-is( scalar @messages, 0, q{The cleaned stuff shouldn't have any errors} );
-diag( 'But they do...', Dumper(\@messages) ) if @messages;
+is_deeply( \@messages, [], q{The cleaned stuff shouldn't have any errors} );
$clean =~ s/"(HTML Tidy|tidyp).+w3\.org"/"Tidy"/;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/HTML-Tidy-1.54/t/simple.t new/HTML-Tidy-1.56/t/simple.t
--- old/HTML-Tidy-1.54/t/simple.t 2010-09-17 05:13:22.000000000 +0200
+++ new/HTML-Tidy-1.56/t/simple.t 2013-09-23 00:10:27.000000000 +0200
@@ -1,13 +1,11 @@
-#!perl -w
+#!perl -T
use warnings;
use strict;
use Test::More tests => 4;
-BEGIN {
- use_ok( 'HTML::Tidy' );
-}
+use HTML::Tidy;
my $html = join '', <DATA>;
@@ -15,13 +13,14 @@
isa_ok( $tidy, 'HTML::Tidy' );
$tidy->ignore( type => TIDY_INFO );
-$tidy->parse( '-', $html );
+my $rc = $tidy->parse( '-', $html );
+ok( $rc, 'Parsed OK' );
my @messages = $tidy->messages;
is( scalar @messages, 5, 'Right number of initial messages' );
$tidy->clear_messages;
-is( scalar $tidy->messages, 0, 'Cleared the messages' );
+is_deeply( [$tidy->messages], [], 'Cleared the messages' );
__DATA__
<html>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/HTML-Tidy-1.54/t/too-many-titles.t new/HTML-Tidy-1.56/t/too-many-titles.t
--- old/HTML-Tidy-1.54/t/too-many-titles.t 2010-09-17 05:13:22.000000000 +0200
+++ new/HTML-Tidy-1.56/t/too-many-titles.t 2013-09-22 23:35:39.000000000 +0200
@@ -1,12 +1,11 @@
-#!perl -Tw
+#!perl -T
use warnings;
use strict;
+
use Test::More tests => 3;
-BEGIN {
- use_ok( 'HTML::Tidy' );
-}
+use HTML::Tidy;
my $html = join '', <DATA>;
@@ -17,10 +16,11 @@
chomp @expected;
shift @expected; # First one's blank
-my $tidy = new HTML::Tidy;
+my $tidy = HTML::Tidy->new;
isa_ok( $tidy, 'HTML::Tidy' );
$tidy->ignore( type => TIDY_INFO );
-$tidy->parse( '-', $html );
+my $rc = $tidy->parse( '-', $html );
+ok( $rc, 'Parsed OK' );
my @returned = map { $_->as_string } $tidy->messages;
s/[\r\n]+\z// for @returned;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/HTML-Tidy-1.54/t/unicode-nbsp.t new/HTML-Tidy-1.56/t/unicode-nbsp.t
--- old/HTML-Tidy-1.54/t/unicode-nbsp.t 1970-01-01 01:00:00.000000000 +0100
+++ new/HTML-Tidy-1.56/t/unicode-nbsp.t 2013-09-23 00:12:06.000000000 +0200
@@ -0,0 +1,20 @@
+#!perl -T
+
+use warnings;
+use strict;
+
+use Test::More tests => 2;
+
+use HTML::Tidy;
+
+use Encode;
+
+my $bytes_string = "\x{c2}\x{a0}"; #UTF8 nbsp
+my $perl_chars = Encode::decode('utf8',$bytes_string); #perl chars of utf8 byte string
+
+my $expected_after_tidy = " \n"; # HTML::Tidy adds a \n and should convert the nbsp to an HTML entity
+
+my $tidy = HTML::Tidy->new({ show_body_only => 1 });
+
+is( $tidy->clean( $perl_chars ), $expected_after_tidy, 'Perl chars OK' );
+is( $tidy->clean( $bytes_string ), $expected_after_tidy, 'Byte string OK' );
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/HTML-Tidy-1.54/t/unicode.t new/HTML-Tidy-1.56/t/unicode.t
--- old/HTML-Tidy-1.54/t/unicode.t 2010-09-17 05:13:22.000000000 +0200
+++ new/HTML-Tidy-1.56/t/unicode.t 2013-09-23 00:08:59.000000000 +0200
@@ -1,30 +1,29 @@
-#!perl -Tw
-# unicode.t
+#!perl -T
# Copyright (c) 2006 Jonathan Rockway <jrockway(a)cpan.org>
use warnings;
use strict;
-use Test::More tests => 7;
-BEGIN {
- use_ok( 'HTML::Tidy' );
-}
+use Test::More tests => 9;
+
+use HTML::Tidy;
+use Encode ();
+use Carp;
my $args = { newline => 'Lf' };
my $tidy = HTML::Tidy->new($args);
$tidy->ignore( type => TIDY_INFO );
-# suck in the reference HTML document
-open( my $html_in, '<:utf8', 't/unicode.html' ) or
- die "Can't read unicode.html: $!";
+# Suck in the reference HTML document.
+open( my $html_in, '<:utf8', 't/unicode.html' ) or Carp::croak( "Can't read unicode.html: $!" );
my $html = do { local $/; <$html_in> };
close $html_in;
-# suck in the correct, cleaned doc (from DATA)
+# Suck in the correct, cleaned doc (from DATA)
binmode DATA, ':utf8';
my $reference = do {local $/; <DATA>};
-# make sure both are unicode characters (not utf-x octets)
+# Make sure both are unicode characters (not utf-x octets).
ok(utf8::is_utf8($html), 'html is utf8');
ok(utf8::is_utf8($reference), 'reference is utf8');
@@ -36,12 +35,24 @@
is($clean, $reference, q{Cleanup didn't break anything});
my @messages = $tidy->messages;
-is( scalar @messages, 0, q{There shouldn't have been any errors});
+is_deeply( \@messages, [], q{There still shouldn't be any errors} );
$tidy = HTML::Tidy->new($args);
-$tidy->parse( '', $html );
+isa_ok( $tidy, 'HTML::Tidy' );
+my $rc = $tidy->parse( '', $html );
+ok( $rc, 'Parsed OK' );
@messages = $tidy->messages;
-is( scalar @messages, 0, q{There still shouldn't be any errors});
+is_deeply( \@messages, [], q{There still shouldn't be any errors} );
+
+subtest 'Try send bytes to clean method.' => sub {
+ my $html = Encode::encode('utf8',$html);
+ ok(!utf8::is_utf8($html), 'html is row bytes');
+ my $clean = $tidy->clean( $html );
+ ok(utf8::is_utf8($clean), 'but cleaned output is string');
+ $clean =~ s/"HTML Tidy.+w3\.org"/"Tidy"/;
+ $clean =~ s/"(HTML Tidy|tidyp).+w3\.org"/"Tidy"/;
+ is($clean, $reference, q{Cleanup didn't break anything});
+};
__DATA__
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2//EN">
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/HTML-Tidy-1.54/t/venus.t new/HTML-Tidy-1.56/t/venus.t
--- old/HTML-Tidy-1.54/t/venus.t 2010-09-17 05:13:22.000000000 +0200
+++ new/HTML-Tidy-1.56/t/venus.t 2013-09-22 22:57:22.000000000 +0200
@@ -1,13 +1,11 @@
-#!perl -Tw
+#!perl -T
use warnings;
use strict;
-use Test::More;
-BEGIN {
- plan tests => 3;
- use_ok( 'HTML::Tidy' );
-}
+use Test::More tests => 2;
+
+use HTML::Tidy;
my $filename = 't/venus.html';
open( my $fh, '<', $filename ) or die "Can't open $filename: $!\n";
@@ -15,7 +13,7 @@
close $fh;
my $cfg = 't/venus.cfg';
-my $tidy = new HTML::Tidy( {config_file => $cfg} );
+my $tidy = HTML::Tidy->new( {config_file => $cfg} );
isa_ok( $tidy, 'HTML::Tidy' );
my $cooked = $tidy->clean( $raw );
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/HTML-Tidy-1.54/t/version.t new/HTML-Tidy-1.56/t/version.t
--- old/HTML-Tidy-1.54/t/version.t 2010-09-17 05:21:10.000000000 +0200
+++ new/HTML-Tidy-1.56/t/version.t 2013-09-22 22:57:22.000000000 +0200
@@ -1,16 +1,13 @@
-#!perl -Tw
+#!perl -T
use warnings;
use strict;
-use Test::More;
-BEGIN {
- plan tests => 5;
- use_ok( 'HTML::Tidy' );
-}
+use Test::More tests => 4;
+
+use HTML::Tidy;
for my $version_string (HTML::Tidy->tidyp_version, HTML::Tidy->libtidyp_version) {
like( $version_string, qr/^\d\.\d{2,}$/, 'Valid version string' );
cmp_ok( $version_string, '>=', '0.90', 'Version is greater than 0.90, which is the one I maintain' );
}
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/HTML-Tidy-1.54/t/wordwrap.t new/HTML-Tidy-1.56/t/wordwrap.t
--- old/HTML-Tidy-1.54/t/wordwrap.t 2010-09-17 05:13:22.000000000 +0200
+++ new/HTML-Tidy-1.56/t/wordwrap.t 2013-09-22 22:57:22.000000000 +0200
@@ -1,12 +1,11 @@
-#!perl -Tw
+#!perl -T
+
use warnings;
use strict;
-use Test::More;
-BEGIN {
- plan tests => 2;
- use_ok( 'HTML::Tidy' );
-}
+use Test::More tests => 1;
+
+use HTML::Tidy;
my $input=q{Here's some <B>ed and <BR/>eakfest MarkUp};
@@ -30,7 +29,7 @@
my @expected = split(/\n/, $expected);
my $cfg = 't/wordwrap.cfg';
-my $tidy = new HTML::Tidy( {config_file => $cfg} );
+my $tidy = HTML::Tidy->new( {config_file => $cfg} );
my $result = $tidy->clean( $input );
my @result = split(/\n/, $result);
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package pam for openSUSE:13.1 checked in at 2013-09-29 17:50:49
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:13.1/pam (Old)
and /work/SRC/openSUSE:13.1/.pam.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "pam"
Changes:
--------
--- /work/SRC/openSUSE:13.1/pam/pam.changes 2013-09-26 19:39:53.000000000 +0200
+++ /work/SRC/openSUSE:13.1/.pam.new/pam.changes 2013-09-29 17:50:55.000000000 +0200
@@ -1,0 +2,5 @@
+Sat Sep 28 09:26:21 UTC 2013 - mc(a)suse.com
+
+- fix manpages links (bnc#842872) [fix-man-links.dif]
+
+-------------------------------------------------------------------
New:
----
fix-man-links.dif
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ pam.spec ++++++
--- /var/tmp/diff_new_pack.vu4xyX/_old 2013-09-29 17:50:55.000000000 +0200
+++ /var/tmp/diff_new_pack.vu4xyX/_new 2013-09-29 17:50:55.000000000 +0200
@@ -52,6 +52,7 @@
Source7: common-session.pamd
Source8: etc.environment
Source9: baselibs.conf
+Patch0: fix-man-links.dif
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@@ -95,6 +96,7 @@
%prep
%setup -q -n Linux-PAM-%{version} -b 1
+%patch0 -p1
%build
export CFLAGS="%optflags -DNDEBUG"
++++++ fix-man-links.dif ++++++
Index: Linux-PAM-1.1.8/doc/man/pam.8
===================================================================
--- Linux-PAM-1.1.8.orig/doc/man/pam.8
+++ Linux-PAM-1.1.8/doc/man/pam.8
@@ -1 +1 @@
-.so PAM.8
+.so man8/PAM.8
Index: Linux-PAM-1.1.8/doc/man/pam.d.5
===================================================================
--- Linux-PAM-1.1.8.orig/doc/man/pam.d.5
+++ Linux-PAM-1.1.8/doc/man/pam.d.5
@@ -1 +1 @@
-.so pam.conf.5
+.so man5/pam.conf.5
Index: Linux-PAM-1.1.8/doc/man/pam_get_authtok_noverify.3
===================================================================
--- Linux-PAM-1.1.8.orig/doc/man/pam_get_authtok_noverify.3
+++ Linux-PAM-1.1.8/doc/man/pam_get_authtok_noverify.3
@@ -1 +1 @@
-.so pam_get_authtok.3
+.so man3/pam_get_authtok.3
Index: Linux-PAM-1.1.8/doc/man/pam_get_authtok_verify.3
===================================================================
--- Linux-PAM-1.1.8.orig/doc/man/pam_get_authtok_verify.3
+++ Linux-PAM-1.1.8/doc/man/pam_get_authtok_verify.3
@@ -1 +1 @@
-.so pam_get_authtok.3
+.so man3/pam_get_authtok.3
Index: Linux-PAM-1.1.8/doc/man/pam_verror.3
===================================================================
--- Linux-PAM-1.1.8.orig/doc/man/pam_verror.3
+++ Linux-PAM-1.1.8/doc/man/pam_verror.3
@@ -1 +1 @@
-.so pam_error.3
+.so man3/pam_error.3
Index: Linux-PAM-1.1.8/doc/man/pam_vinfo.3
===================================================================
--- Linux-PAM-1.1.8.orig/doc/man/pam_vinfo.3
+++ Linux-PAM-1.1.8/doc/man/pam_vinfo.3
@@ -1 +1 @@
-.so pam_info.3
+.so man3/pam_info.3
Index: Linux-PAM-1.1.8/doc/man/pam_vprompt.3
===================================================================
--- Linux-PAM-1.1.8.orig/doc/man/pam_vprompt.3
+++ Linux-PAM-1.1.8/doc/man/pam_vprompt.3
@@ -1 +1 @@
-.so pam_prompt.3
+.so man3/pam_prompt.3
Index: Linux-PAM-1.1.8/doc/man/pam_vsyslog.3
===================================================================
--- Linux-PAM-1.1.8.orig/doc/man/pam_vsyslog.3
+++ Linux-PAM-1.1.8/doc/man/pam_vsyslog.3
@@ -1 +1 @@
-.so pam_syslog.3
+.so man3/pam_syslog.3
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0