From fc125e2549a8cfbbd912c8acfaade123511da3b7 Mon Sep 17 00:00:00 2001 From: cvsdist Date: Thu, 9 Sep 2004 07:33:26 +0000 Subject: [PATCH 001/157] Setup of module libidn --- .cvsignore | 0 Makefile | 6 ++++++ sources | 0 3 files changed, 6 insertions(+) create mode 100644 .cvsignore create mode 100644 Makefile create mode 100644 sources diff --git a/.cvsignore b/.cvsignore new file mode 100644 index 0000000..e69de29 diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..b491733 --- /dev/null +++ b/Makefile @@ -0,0 +1,6 @@ +# Makefile for source rpm: libidn +# $Id$ +NAME := libidn +SPECFILE = $(firstword $(wildcard *.spec)) + +include ../common/Makefile.common diff --git a/sources b/sources new file mode 100644 index 0000000..e69de29 From 9444714f7cff111e5c4151b1a9fa46eeb07815e9 Mon Sep 17 00:00:00 2001 From: cvsdist Date: Thu, 9 Sep 2004 07:33:28 +0000 Subject: [PATCH 002/157] auto-import changelog data from libidn-0.4.3-1.src.rpm Thu Apr 29 2004 Joe Orton 0.4.3-1 - update to 0.4.3, remove -rpath patch Tue Jan 27 2004 Joe Orton 0.3.7-1 - update to 0.3.7, simplify Wed Jan 07 2004 Lenny Cartier 0.3.6-1mdk - 0.3.6 Mon Dec 15 2003 Oden Eriksson 0.3.5-1mdk - 0.3.5 Sun Oct 19 2003 Oden Eriksson 0.3.3-2mdk - drop the "soname fix" and use the correct way... Sat Oct 18 2003 Oden Eriksson 0.3.3-1mdk - 0.3.3 Mon Oct 13 2003 Oden Eriksson 0.3.2-1mdk - initial cooker contrib - used the package from PLD as a start point --- .cvsignore | 1 + libidn.spec | 96 +++++++++++++++++++++++++++++++++++++++++++++++++++++ sources | 1 + 3 files changed, 98 insertions(+) create mode 100644 libidn.spec diff --git a/.cvsignore b/.cvsignore index e69de29..ea998cc 100644 --- a/.cvsignore +++ b/.cvsignore @@ -0,0 +1 @@ +libidn-0.4.3.tar.gz diff --git a/libidn.spec b/libidn.spec new file mode 100644 index 0000000..0d6a944 --- /dev/null +++ b/libidn.spec @@ -0,0 +1,96 @@ + +Summary: Internationalized Domain Name support library +Name: libidn +Version: 0.4.3 +Release: 1 +URL: http://www.gnu.org/software/libidn +License: LGPL +Source0: %{name}-%{version}.tar.gz +Group: System/Libraries +BuildRoot: %{_tmppath}/%{name}-%{version}-root +BuildRequires: pkgconfig + +%description +GNU Libidn is an implementation of the Stringprep, Punycode and +IDNA specifications defined by the IETF Internationalized Domain +Names (IDN) working group, used for internationalized domain +names. + +%package devel +Summary: Development files for the libidn library +Group: Development/Libraries +Requires: %{name} = %{version}-%{release} +Requires: pkgconfig + +%description devel +This package includes header files and libraries necessary for +developing programs which use the GNU libidn library. + +%prep +%setup -q + +%build +%configure +make %{?_smp_mflags} + +%check +make %{?_smp_mflags} -C tests check + +%install +[ "%{buildroot}" != "/" ] && rm -rf %{buildroot} +%makeinstall + +# provide more examples +make %{?_smp_mflags} -C examples distclean + +# clean up docs +find doc -name "Makefile*" | xargs rm + +rm -rf $RPM_BUILD_ROOT%{_datadir}/{locale,info} + +%post -p /sbin/ldconfig + +%postun -p /sbin/ldconfig + +%clean +[ "%{buildroot}" != "/" ] && rm -rf %{buildroot} + +%files +%defattr(-,root,root) +%doc ChangeLog NEWS FAQ README THANKS COPYING* +%{_bindir}/idn +%{_mandir}/man1/idn.1* +%{_datadir}/emacs/site-lisp +%{_libdir}/libidn.so.* + +%files devel +%defattr(0644,root,root,755) +%doc doc/libidn.html examples contrib +%{_libdir}/libidn.so +%{_libdir}/libidn.*a +%{_includedir}/*.h +%{_libdir}/pkgconfig/*.pc +%{_mandir}/man3/* + +%changelog +* Thu Apr 29 2004 Joe Orton 0.4.3-1 +- update to 0.4.3, remove -rpath patch + +* Tue Jan 27 2004 Joe Orton 0.3.7-1 +- update to 0.3.7, simplify + +* Wed Jan 07 2004 Lenny Cartier 0.3.6-1mdk +- 0.3.6 + +* Mon Dec 15 2003 Oden Eriksson 0.3.5-1mdk +- 0.3.5 + +* Sun Oct 19 2003 Oden Eriksson 0.3.3-2mdk +- drop the "soname fix" and use the correct way... + +* Sat Oct 18 2003 Oden Eriksson 0.3.3-1mdk +- 0.3.3 + +* Mon Oct 13 2003 Oden Eriksson 0.3.2-1mdk +- initial cooker contrib +- used the package from PLD as a start point diff --git a/sources b/sources index e69de29..266bc12 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +037271567340efbe8b23d0aa6c50ea4a libidn-0.4.3.tar.gz From 457cbd2af21d872fed3cc040ba0f5ab81c4db6f6 Mon Sep 17 00:00:00 2001 From: cvsdist Date: Thu, 9 Sep 2004 07:33:31 +0000 Subject: [PATCH 003/157] auto-import changelog data from libidn-0.4.3-2.src.rpm Tue Jun 15 2004 Elliot Lee - rebuilt --- libidn.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libidn.spec b/libidn.spec index 0d6a944..bc46a66 100644 --- a/libidn.spec +++ b/libidn.spec @@ -2,7 +2,7 @@ Summary: Internationalized Domain Name support library Name: libidn Version: 0.4.3 -Release: 1 +Release: 2 URL: http://www.gnu.org/software/libidn License: LGPL Source0: %{name}-%{version}.tar.gz @@ -73,6 +73,9 @@ rm -rf $RPM_BUILD_ROOT%{_datadir}/{locale,info} %{_mandir}/man3/* %changelog +* Tue Jun 15 2004 Elliot Lee +- rebuilt + * Thu Apr 29 2004 Joe Orton 0.4.3-1 - update to 0.4.3, remove -rpath patch From c5c397e5e854fec5399e025d61100045ad811eb0 Mon Sep 17 00:00:00 2001 From: cvsdist Date: Thu, 9 Sep 2004 07:33:35 +0000 Subject: [PATCH 004/157] auto-import libidn-0.4.9-1 from libidn-0.4.9-1.src.rpm --- .cvsignore | 2 +- libidn.spec | 12 +++++++++--- sources | 2 +- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/.cvsignore b/.cvsignore index ea998cc..6a7abe4 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -libidn-0.4.3.tar.gz +libidn-0.4.9.tar.gz diff --git a/libidn.spec b/libidn.spec index bc46a66..f707682 100644 --- a/libidn.spec +++ b/libidn.spec @@ -1,11 +1,11 @@ Summary: Internationalized Domain Name support library Name: libidn -Version: 0.4.3 -Release: 2 +Version: 0.4.9 +Release: 1 URL: http://www.gnu.org/software/libidn License: LGPL -Source0: %{name}-%{version}.tar.gz +Source0: http://josefsson.org/libidn/releases/libidn-%{version}.tar.gz Group: System/Libraries BuildRoot: %{_tmppath}/%{name}-%{version}-root BuildRequires: pkgconfig @@ -73,9 +73,15 @@ rm -rf $RPM_BUILD_ROOT%{_datadir}/{locale,info} %{_mandir}/man3/* %changelog +* Tue Jun 15 2004 Robert Scheck 0.4.9-1 +- upgrade to 0.4.9 (#126353) + * Tue Jun 15 2004 Elliot Lee - rebuilt +* Thu Apr 29 2004 Joe Orton 0.4.4-1 +- update to 0.4.4; remove contrib from -devel docs + * Thu Apr 29 2004 Joe Orton 0.4.3-1 - update to 0.4.3, remove -rpath patch diff --git a/sources b/sources index 266bc12..988ac4e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -037271567340efbe8b23d0aa6c50ea4a libidn-0.4.3.tar.gz +cc87a7bdce60a6e229f0984ca551e273 libidn-0.4.9.tar.gz From 537492cccd1ee51b9c20fe328a692c0db123512b Mon Sep 17 00:00:00 2001 From: cvsdist Date: Thu, 9 Sep 2004 07:33:43 +0000 Subject: [PATCH 005/157] auto-import changelog data from libidn-0.4.9-2.src.rpm Tue Jun 22 2004 Than Ngo 0.4.9-2 - add prereq: /sbin/ldconfig - move la file in main package --- libidn.spec | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/libidn.spec b/libidn.spec index f707682..872c017 100644 --- a/libidn.spec +++ b/libidn.spec @@ -1,14 +1,14 @@ - Summary: Internationalized Domain Name support library Name: libidn Version: 0.4.9 -Release: 1 +Release: 2 URL: http://www.gnu.org/software/libidn License: LGPL Source0: http://josefsson.org/libidn/releases/libidn-%{version}.tar.gz Group: System/Libraries BuildRoot: %{_tmppath}/%{name}-%{version}-root BuildRequires: pkgconfig +Prereq: /sbin/ldconfig %description GNU Libidn is an implementation of the Stringprep, Punycode and @@ -62,17 +62,22 @@ rm -rf $RPM_BUILD_ROOT%{_datadir}/{locale,info} %{_mandir}/man1/idn.1* %{_datadir}/emacs/site-lisp %{_libdir}/libidn.so.* +%{_libdir}/libidn.la %files devel %defattr(0644,root,root,755) %doc doc/libidn.html examples contrib %{_libdir}/libidn.so -%{_libdir}/libidn.*a +%{_libdir}/libidn.a %{_includedir}/*.h %{_libdir}/pkgconfig/*.pc %{_mandir}/man3/* %changelog +* Tue Jun 22 2004 Than Ngo 0.4.9-2 +- add prereq: /sbin/ldconfig +- move la file in main package + * Tue Jun 15 2004 Robert Scheck 0.4.9-1 - upgrade to 0.4.9 (#126353) From b9f2cd36331be857b29eede8bb9db2338ee287b7 Mon Sep 17 00:00:00 2001 From: cvsdist Date: Thu, 9 Sep 2004 07:33:50 +0000 Subject: [PATCH 006/157] auto-import changelog data from libidn-0.5.0-1.src.rpm Mon Jun 28 2004 Joe Orton 0.5.0-1 - update to 0.5.0 (#126836) --- .cvsignore | 2 +- libidn.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.cvsignore b/.cvsignore index 6a7abe4..f4a7183 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -libidn-0.4.9.tar.gz +libidn-0.5.0.tar.gz diff --git a/libidn.spec b/libidn.spec index 872c017..8b98183 100644 --- a/libidn.spec +++ b/libidn.spec @@ -1,7 +1,7 @@ Summary: Internationalized Domain Name support library Name: libidn -Version: 0.4.9 -Release: 2 +Version: 0.5.0 +Release: 1 URL: http://www.gnu.org/software/libidn License: LGPL Source0: http://josefsson.org/libidn/releases/libidn-%{version}.tar.gz @@ -74,6 +74,9 @@ rm -rf $RPM_BUILD_ROOT%{_datadir}/{locale,info} %{_mandir}/man3/* %changelog +* Mon Jun 28 2004 Joe Orton 0.5.0-1 +- update to 0.5.0 (#126836) + * Tue Jun 22 2004 Than Ngo 0.4.9-2 - add prereq: /sbin/ldconfig - move la file in main package diff --git a/sources b/sources index 988ac4e..5f41217 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -cc87a7bdce60a6e229f0984ca551e273 libidn-0.4.9.tar.gz +d13633479facc9163eb16db6f9662a3b libidn-0.5.0.tar.gz From 212126ddabb70878e1778e5ef85792c5e4429546 Mon Sep 17 00:00:00 2001 From: cvsdist Date: Thu, 9 Sep 2004 07:33:52 +0000 Subject: [PATCH 007/157] auto-import changelog data from libidn-0.5.1-1.src.rpm Fri Jul 09 2004 Joe Orton 0.5.1-1 - update to 0.5.1 (#127496) --- .cvsignore | 2 +- libidn.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index f4a7183..597b7d9 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -libidn-0.5.0.tar.gz +libidn-0.5.1.tar.gz diff --git a/libidn.spec b/libidn.spec index 8b98183..1c95c29 100644 --- a/libidn.spec +++ b/libidn.spec @@ -1,6 +1,6 @@ Summary: Internationalized Domain Name support library Name: libidn -Version: 0.5.0 +Version: 0.5.1 Release: 1 URL: http://www.gnu.org/software/libidn License: LGPL @@ -74,6 +74,9 @@ rm -rf $RPM_BUILD_ROOT%{_datadir}/{locale,info} %{_mandir}/man3/* %changelog +* Fri Jul 9 2004 Joe Orton 0.5.1-1 +- update to 0.5.1 (#127496) + * Mon Jun 28 2004 Joe Orton 0.5.0-1 - update to 0.5.0 (#126836) diff --git a/sources b/sources index 5f41217..145e65d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d13633479facc9163eb16db6f9662a3b libidn-0.5.0.tar.gz +2fd747e73aa974b29fce7451d8ca456c libidn-0.5.1.tar.gz From 168a45d380790a3f6867ac838884fa53baa488c8 Mon Sep 17 00:00:00 2001 From: cvsdist Date: Thu, 9 Sep 2004 07:33:56 +0000 Subject: [PATCH 008/157] auto-import changelog data from libidn-0.5.2-1.src.rpm Thu Jul 15 2004 Robert Scheck 0.5.2-1 - upgrade to 0.5.2, enabled i18n support and info files (#127906) --- .cvsignore | 2 +- libidn.spec | 25 ++++++++++++++++++------- sources | 2 +- 3 files changed, 20 insertions(+), 9 deletions(-) diff --git a/.cvsignore b/.cvsignore index 597b7d9..bc1ea43 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -libidn-0.5.1.tar.gz +libidn-0.5.2.tar.gz diff --git a/libidn.spec b/libidn.spec index 1c95c29..43d647c 100644 --- a/libidn.spec +++ b/libidn.spec @@ -1,14 +1,14 @@ Summary: Internationalized Domain Name support library Name: libidn -Version: 0.5.1 +Version: 0.5.2 Release: 1 URL: http://www.gnu.org/software/libidn License: LGPL Source0: http://josefsson.org/libidn/releases/libidn-%{version}.tar.gz Group: System/Libraries BuildRoot: %{_tmppath}/%{name}-%{version}-root -BuildRequires: pkgconfig -Prereq: /sbin/ldconfig +BuildRequires: pkgconfig, gettext +Prereq: /sbin/ldconfig, /sbin/install-info %description GNU Libidn is an implementation of the Stringprep, Punycode and @@ -45,17 +45,24 @@ make %{?_smp_mflags} -C examples distclean # clean up docs find doc -name "Makefile*" | xargs rm +rm -rf $RPM_BUILD_ROOT%{_datadir}/info/dir -rm -rf $RPM_BUILD_ROOT%{_datadir}/{locale,info} +%find_lang %{name} -%post -p /sbin/ldconfig +%post +/sbin/install-info %{_infodir}/%{name}.info.gz %{_infodir}/dir +/sbin/ldconfig -%postun -p /sbin/ldconfig +%preun +if [ $1 = 0 ]; then + /sbin/install-info --delete %{_infodir}/%{name}.info.gz %{_infodir}/dir +fi +/sbin/ldconfig %clean [ "%{buildroot}" != "/" ] && rm -rf %{buildroot} -%files +%files -f %{name}.lang %defattr(-,root,root) %doc ChangeLog NEWS FAQ README THANKS COPYING* %{_bindir}/idn @@ -63,6 +70,7 @@ rm -rf $RPM_BUILD_ROOT%{_datadir}/{locale,info} %{_datadir}/emacs/site-lisp %{_libdir}/libidn.so.* %{_libdir}/libidn.la +%{_infodir}/%{name}.info.gz %files devel %defattr(0644,root,root,755) @@ -74,6 +82,9 @@ rm -rf $RPM_BUILD_ROOT%{_datadir}/{locale,info} %{_mandir}/man3/* %changelog +* Thu Jul 15 2004 Robert Scheck 0.5.2-1 +- upgrade to 0.5.2, enabled i18n support and info files (#127906) + * Fri Jul 9 2004 Joe Orton 0.5.1-1 - update to 0.5.1 (#127496) diff --git a/sources b/sources index 145e65d..49e5a44 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -2fd747e73aa974b29fce7451d8ca456c libidn-0.5.1.tar.gz +fef54277d08cc74e7e99ff65e058e1b7 libidn-0.5.2.tar.gz From 22ef03c0b9817d3e1a969665c446cca741362865 Mon Sep 17 00:00:00 2001 From: cvsdist Date: Thu, 9 Sep 2004 07:34:20 +0000 Subject: [PATCH 009/157] auto-import changelog data from libidn-0.5.4-1.src.rpm Sun Aug 08 2004 Joe Orton 0.5.4-1 - update to 0.5.4 (#129341) --- .cvsignore | 2 +- libidn.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index bc1ea43..c00ae05 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -libidn-0.5.2.tar.gz +libidn-0.5.4.tar.gz diff --git a/libidn.spec b/libidn.spec index 43d647c..381e056 100644 --- a/libidn.spec +++ b/libidn.spec @@ -1,6 +1,6 @@ Summary: Internationalized Domain Name support library Name: libidn -Version: 0.5.2 +Version: 0.5.4 Release: 1 URL: http://www.gnu.org/software/libidn License: LGPL @@ -82,6 +82,9 @@ fi %{_mandir}/man3/* %changelog +* Sun Aug 8 2004 Joe Orton 0.5.4-1 +- update to 0.5.4 (#129341) + * Thu Jul 15 2004 Robert Scheck 0.5.2-1 - upgrade to 0.5.2, enabled i18n support and info files (#127906) diff --git a/sources b/sources index 49e5a44..db683ae 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -fef54277d08cc74e7e99ff65e058e1b7 libidn-0.5.2.tar.gz +1b2d61e13ff39485571ad4e8b749596e libidn-0.5.4.tar.gz From fb9598408fabc4e53ea56a5d03bc82f668c69978 Mon Sep 17 00:00:00 2001 From: cvsdist Date: Thu, 9 Sep 2004 07:34:33 +0000 Subject: [PATCH 010/157] auto-import changelog data from libidn-0.5.4-2.src.rpm Tue Aug 31 2004 Joe Orton 0.5.4-2 - move ldconfig from preun to postun (#131280) --- libidn.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/libidn.spec b/libidn.spec index 381e056..9825f92 100644 --- a/libidn.spec +++ b/libidn.spec @@ -1,7 +1,7 @@ Summary: Internationalized Domain Name support library Name: libidn Version: 0.5.4 -Release: 1 +Release: 2 URL: http://www.gnu.org/software/libidn License: LGPL Source0: http://josefsson.org/libidn/releases/libidn-%{version}.tar.gz @@ -57,7 +57,8 @@ rm -rf $RPM_BUILD_ROOT%{_datadir}/info/dir if [ $1 = 0 ]; then /sbin/install-info --delete %{_infodir}/%{name}.info.gz %{_infodir}/dir fi -/sbin/ldconfig + +%postun -p /sbin/ldconfig %clean [ "%{buildroot}" != "/" ] && rm -rf %{buildroot} @@ -82,6 +83,9 @@ fi %{_mandir}/man3/* %changelog +* Tue Aug 31 2004 Joe Orton 0.5.4-2 +- move ldconfig from preun to postun (#131280) + * Sun Aug 8 2004 Joe Orton 0.5.4-1 - update to 0.5.4 (#129341) From f23d41556437466bb872cef88d4cc6bcd9f677f4 Mon Sep 17 00:00:00 2001 From: Miloslav Trmac Date: Wed, 29 Sep 2004 23:10:57 +0000 Subject: [PATCH 011/157] - Fix Group: (#134068) --- libidn.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/libidn.spec b/libidn.spec index 9825f92..f876462 100644 --- a/libidn.spec +++ b/libidn.spec @@ -1,11 +1,11 @@ Summary: Internationalized Domain Name support library Name: libidn Version: 0.5.4 -Release: 2 +Release: 3 URL: http://www.gnu.org/software/libidn License: LGPL Source0: http://josefsson.org/libidn/releases/libidn-%{version}.tar.gz -Group: System/Libraries +Group: System Environment/Libraries BuildRoot: %{_tmppath}/%{name}-%{version}-root BuildRequires: pkgconfig, gettext Prereq: /sbin/ldconfig, /sbin/install-info @@ -83,6 +83,9 @@ fi %{_mandir}/man3/* %changelog +* Thu Sep 30 2004 Miloslav Trmac - 0.5.4-3 +- Fix Group: (#134068) + * Tue Aug 31 2004 Joe Orton 0.5.4-2 - move ldconfig from preun to postun (#131280) From cc35600c738f8859a20e67d2027107fa3837a07a Mon Sep 17 00:00:00 2001 From: jorton Date: Thu, 7 Oct 2004 16:00:22 +0000 Subject: [PATCH 012/157] - update to 0.5.6 (#134343) --- .cvsignore | 2 +- Makefile | 1 + libidn.spec | 7 +++-- mirrors | 1 + sources | 2 +- upstream | 1 + upstream-key.gpg | 70 ++++++++++++++++++++++++++++++++++++++++++++++++ 7 files changed, 80 insertions(+), 4 deletions(-) create mode 100644 mirrors create mode 100644 upstream create mode 100644 upstream-key.gpg diff --git a/.cvsignore b/.cvsignore index c00ae05..0aebdc1 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -libidn-0.5.4.tar.gz +libidn-0.5.6.tar.gz diff --git a/Makefile b/Makefile index b491733..f6e1efd 100644 --- a/Makefile +++ b/Makefile @@ -2,5 +2,6 @@ # $Id$ NAME := libidn SPECFILE = $(firstword $(wildcard *.spec)) +UPSTREAM_CHECKS = sig include ../common/Makefile.common diff --git a/libidn.spec b/libidn.spec index f876462..f820b43 100644 --- a/libidn.spec +++ b/libidn.spec @@ -1,7 +1,7 @@ Summary: Internationalized Domain Name support library Name: libidn -Version: 0.5.4 -Release: 3 +Version: 0.5.6 +Release: 1 URL: http://www.gnu.org/software/libidn License: LGPL Source0: http://josefsson.org/libidn/releases/libidn-%{version}.tar.gz @@ -83,6 +83,9 @@ fi %{_mandir}/man3/* %changelog +* Thu Oct 7 2004 Joe Orton 0.5.6-1 +- update to 0.5.6 (#134343) + * Thu Sep 30 2004 Miloslav Trmac - 0.5.4-3 - Fix Group: (#134068) diff --git a/mirrors b/mirrors new file mode 100644 index 0000000..583b40f --- /dev/null +++ b/mirrors @@ -0,0 +1 @@ +http://josefsson.org/libidn/releases/ diff --git a/sources b/sources index db683ae..1732888 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -1b2d61e13ff39485571ad4e8b749596e libidn-0.5.4.tar.gz +81f6618767a8b36f4c3150715e1fe958 libidn-0.5.6.tar.gz diff --git a/upstream b/upstream new file mode 100644 index 0000000..0aebdc1 --- /dev/null +++ b/upstream @@ -0,0 +1 @@ +libidn-0.5.6.tar.gz diff --git a/upstream-key.gpg b/upstream-key.gpg new file mode 100644 index 0000000..57a672b --- /dev/null +++ b/upstream-key.gpg @@ -0,0 +1,70 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- +Version: GnuPG v1.3.90-cvs (GNU/Linux) + +mKsEPNUHKwEFALqJSBHn6Qk5ex138kwymxA3idCFoTi5Q6mVooEVVaYVfeDG+5uV +T5rhTFDfDcT9SO0eIlfKOraSRnVEHyDDH2PAgJFxyneFELcmLUQ66D+m8z+ziGro +6bcDSBBDMRkHIX6/kH/vnevjqivIld+j8WTcVX+SArcKyzgQ58uMTrfQdLqzh6D9 +sE/838+ZPZkabmKKWMVWccoaUbWGYOcNwO0ABim0JVNpbW9uIEpvc2Vmc3NvbiA8 +c2ltb25Aam9zZWZzc29uLm9yZz6I2AQTAQIAIgIbAwQLBwMCAxUCAwMWAgECHgEC +F4AFAkCGvikFCQSfBP4ACgkQ7aIelLVlcW9oqwT/a2nWkFFy1q16WURE8vp+Tqu6 +i4r5mTdyHjbhQeZh5Pub5DEJiFuWXxE73JVrnNozacQbVbsnn54B4Xv6tuEDMxaT +XSjreDY6D08urM8A0gnUHCAOwxtmepm9wxk/l3WAXWwzQoQaqZ2PSPFGW4Epk8+J +wWKoLv1O2i9NbycGEccF9rr6I12319Vzk+P4P3FOgCwadAQHSGS3Y6hlLm/RGIhG +BBMRAgAGBQI9WPLCAAoJEFeTKdPAGyoiZjcAoJII47kuU3GauK1QVjWLtVcEJSVm +AKCWX/qQTQb80/cToB3LNXADME+BR4hMBBMRAgAMBQI9XrB1BYMBV4o2AAoJELy7 +xJVxipJWV5cAn01kpS9v96uTnd8wVTClR4KU6OGrAJwLcO71RCMKfaT7staCo0wf +6G6pbYhGBBMRAgAGBQJBAMqCAAoJEJ7XWD/BTrKCtF0An0TdUAVZO/3ruGGxUAah ++Ot3XB8eAKDKdkLqzEVxQyJrMCdVovSuuXauuohGBBMRAgAGBQJA/z+GAAoJEJb/ +mcQlwOwLvSgAn2CjJzD5pW2Q4ufy3uJnCwlJUPkrAJ9qjkNeJf3pZa2qll272nAi +ZDsjaYhMBBIRAgAMBQJA4Fc9BYMAk7TsAAoJEMiB3UdK56tHLK8AoLS9u/53aY3s +NvGxlWFPbQZiINhlAKChRSih7yQdqVY0ZES+A46IUnSK5IjYBBMBAgAiAhsDBAsH +AwIDFQIDAxYCAQIeAQIXgAUCPr1HRAUJAtWOGQAKCRDtoh6UtWVxb3F2BP9Whe+A +rZn6WlbpHF+37Rqr+KmXL2fLI0b+phneaieRvACsOmPD3jDpvxz/xVf8s49SJ2+a +23IaiCA8Boyws9sBxn5N+yWhdYYjfDbH3JUOQz7BKN/9o8EAYuU8pmQtEN0q4+Qi +NsU0a8qLAV3qmEOwLfkB4z4H+aDZxe/p7vIYP4QmzTn3ZQ0mYR5mxpc52pF82KVy +NWWJvmcirPwKSckEiNgEEwECACICGwMECwcDAgMVAgMDFgIBAh4BAheABQI/pCtU +BQkDvHImAAoJEO2iHpS1ZXFvPREE/j3fX+cLxCCZNTjMhThGFujiT7ty4x1jVc91 +J6QOA+Jp+78NIIeyg3JTeR3WIv7/WFNzLKJXJEEcga+0ViPjoLfvGsHMAnwXqPYA +xu1cDY4jId0bCYgoVlnfF9gwOWxebtotLpCiuXGL/168zEAXWJpPg6r2MfPhAKUJ +9G8q52OOWJW3cObxoZ2gyXjuWOFtygZ1vUAqP/8UGeZNdajHD5uI2AQTAQIAIgUC +PSXPPQIbAwUJAeEzgAQLBwMCAxUCAwMWAgECHgECF4AACgkQ7aIelLVlcW+3cwT+ +KPAUkJI2hjUB8ISbcBfq9EpRuOLLQx16aypqNcXprBxshp4LCTfBWv0k6zW6y7b8 +BBAO/PSx/+ES/pzewxNiykPr5DOtExRVsubR+n6lFkrJpbW0778kig6Xyqw7Ch2R +c9DsJgW9JmGGTF1TBU5rpS0vqQ50KNADLsMNBPN1wL8bEdA1VQ0XkpwFYLssw3qI +C3R0AUQxpDPi3fsIer4MLLQhU2ltb24gSm9zZWZzc29uIDxqYXNAZXh0dW5kby5j +b20+iNgEEwECACICGwMECwcDAgMVAgMDFgIBAh4BAheABQJAhr4rBQkEnwT+AAoJ +EO2iHpS1ZXFvkxgE/2ZfCBqYKIe3SDM0tOVNrIeSZuVNUyn2xoqRKK4VomvTI1eM +ShfGa0twPVlBB5xXHt06yRbwjobJykmDc/Hmteel+FVWOcehnXq8T22gLENlEM0C +UZellosNwFwdnWGOHGZs/B4BVCh2pzsCra6di7MKCznZDOHX3TBLoqVHjWzCldxt +wc6Y7fAsEtrLVos4+0JvjQoYYgHQyril5ywHYs+IRgQTEQIABgUCPVjyvwAKCRBX +kynTwBsqIhf3AJ9HasyJd0rNkH3lpwDlhJDgwtDLKACfU2/szfpICh9H/vdaOqU+ +lUBD59GITAQTEQIADAUCPV6wdQWDAVeKNgAKCRC8u8SVcYqSVhmdAJ45cjOYShnn +I5U3KCmFiZTA439LwgCffaBYPJpMymrINwkRB4t2NxbtuhKIRgQTEQIABgUCQQDK +fQAKCRCe11g/wU6ygvegAJ9cAzRBE2V+rw6AmHVBqVfDVIsllQCgoCgYAAAZvsXU +c72NsrSjAgjyyx6IRgQTEQIABgUCQP8/dwAKCRCW/5nEJcDsC1uxAKC6gBDLFxVI +90nAFw2HL0GkfuZTewCgzz7P/bYsbVpLh21vUj7mlHw4s0GITAQSEQIADAUCQOBX +PQWDAJO07AAKCRDIgd1HSuerR2AIAKCp7WDpLQxo+R+bvYXyKhPWCGsoRwCfT3Sz +w8ijOgtNX3dNNs0Hv3mqbI+I2AQTAQIAIgIbAwQLBwMCAxUCAwMWAgECHgECF4AF +Aj69R0YFCQLVjhkACgkQ7aIelLVlcW8Y2QT+PjSaIJj37ijex+wJ/HBLkyydqWYV +ZhuTPTVMLst6DQModRBj3Xi7UYlgg7lJ6tRxarVuF/eYW6Zv4jx5FePxKLBeAG+H +4FRQH+ogIXeBlDx41X7L25wjSxxPhQ4CwBNMmSKckD84LdQiPrygbX8JQLsJ08Xu +TzDG7740d0RotqxizGhYP0QJTD67VvffoQ0gLtB5chw7Pc9osT1+j4yizojYBBMB +AgAiAhsDBAsHAwIDFQIDAxYCAQIeAQIXgAUCP6QrUQUJA7xyJgAKCRDtoh6UtWVx +bwueBP4uh9ZEOuSjt2n5OpfuAablsrRzhlgPfluBMfjHNynEFsGjn81l81TCqStR +ln7wDUj95ZufSi3YvoYSFG1jffGMk/k2trgINtT3kxaGkfns6dykBuV7Ki2wWqdJ +kTe1ibyai+RCqt+J1ldSUuHdfQZ5wALPJQRb4Hqi7M29azFHcfxbMLf3yGYyBuKC +7eBVNVaR58UTFK6r0CX3T7eGuk8biNgEEwECACIFAjzVBysCGwMFCQHhM4AECwcD +AgMVAgMDFgIBAh4BAheAAAoJEO2iHpS1ZXFviPIE/RqtM3MxNqQOE7wEITTd3SKu +7qwIUnapB6HhQAVfLwpnnJu1YnEVP9DvGfS5cq6Mn31xeG7LuJwNHXfBaREobbQi +MqI2/3LNBo1Hfr6bnyaNm7VQOcZWbY9P1sQtiYpNWi6aLjhBaBTmWCrkpl9aGwDk +FASpLm2n2TgIEGDfokLCNjEd+dbHKYDWFLIwo+aCY+bpoV34u/13eHmhNWz1ME64 +qwQ81Qd7AQUA2PTaoT8RNkFDlX7UCOB9vaRFxrX+dN7l6QO+O0Mg7dVdjItEnaaY +kJ+r4LXecI47HogsUGExRdDYGT0Dq7aZ8GkC4UKPXc3q2KWQ3ib3wj3qnCGm3IX/ +I249ydYLAzQyWqMW09wLB5vxhPi4yjet4FTGWmtYUlGzDb7+6VZilYRTty0vhFF4 +cVXlO2R+vgPxFMvUc7o8WGDnQ3iyWAizkQAGKYjFBBgBAgAPAhsMBQJAhr5PBQkE +nwTUAAoJEO2iHpS1ZXFvgVIFAI7F/XpVPu8/kRZuDt1XytUMzPr3mR8/vl5KKd59 +yZT45hrr0tu4bJFV+izZDFHpkUXvQU+R5x7cpagr+kflUO8XyE2CJyUEzCauZo2j +3ZbVpjXguKkdlXNdwfcI7F8Wfmdy9LTmU/W9S2HkHMXg0NmHonvGpEjT63Y7JBK4 +Bbyqz6klhKlT2gz8ERwj0JkrKlj/z69eS4/NPek/k5To+AI= +=pOF7 +-----END PGP PUBLIC KEY BLOCK----- From d083e473789880b3dec95107156ca08404764327 Mon Sep 17 00:00:00 2001 From: jorton Date: Mon, 8 Nov 2004 16:20:01 +0000 Subject: [PATCH 013/157] - update to 0.5.9 (#138296) --- .cvsignore | 2 +- libidn.spec | 5 ++++- sources | 2 +- upstream | 2 +- 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.cvsignore b/.cvsignore index 0aebdc1..bb0a73e 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -libidn-0.5.6.tar.gz +libidn-0.5.9.tar.gz diff --git a/libidn.spec b/libidn.spec index f820b43..4f535ea 100644 --- a/libidn.spec +++ b/libidn.spec @@ -1,6 +1,6 @@ Summary: Internationalized Domain Name support library Name: libidn -Version: 0.5.6 +Version: 0.5.9 Release: 1 URL: http://www.gnu.org/software/libidn License: LGPL @@ -83,6 +83,9 @@ fi %{_mandir}/man3/* %changelog +* Mon Nov 8 2004 Joe Orton 0.5.9-1 +- update to 0.5.9 (#138296) + * Thu Oct 7 2004 Joe Orton 0.5.6-1 - update to 0.5.6 (#134343) diff --git a/sources b/sources index 1732888..5b9b3ff 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -81f6618767a8b36f4c3150715e1fe958 libidn-0.5.6.tar.gz +295e939b47d5203134925a882315c495 libidn-0.5.9.tar.gz diff --git a/upstream b/upstream index 0aebdc1..bb0a73e 100644 --- a/upstream +++ b/upstream @@ -1 +1 @@ -libidn-0.5.6.tar.gz +libidn-0.5.9.tar.gz From eaddd5a923de36f592dc3c9e6aa9338d385c1da8 Mon Sep 17 00:00:00 2001 From: jorton Date: Tue, 9 Nov 2004 11:55:23 +0000 Subject: [PATCH 014/157] - update to 0.5.10 - buildroot cleanup fix (Robert Scheck) --- .cvsignore | 2 +- libidn.spec | 10 +++++++--- sources | 2 +- upstream | 2 +- 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/.cvsignore b/.cvsignore index bb0a73e..22d1a74 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -libidn-0.5.9.tar.gz +libidn-0.5.10.tar.gz diff --git a/libidn.spec b/libidn.spec index 4f535ea..02e7e1d 100644 --- a/libidn.spec +++ b/libidn.spec @@ -1,6 +1,6 @@ Summary: Internationalized Domain Name support library Name: libidn -Version: 0.5.9 +Version: 0.5.10 Release: 1 URL: http://www.gnu.org/software/libidn License: LGPL @@ -37,7 +37,7 @@ make %{?_smp_mflags} make %{?_smp_mflags} -C tests check %install -[ "%{buildroot}" != "/" ] && rm -rf %{buildroot} +rm -rf %{buildroot} %makeinstall # provide more examples @@ -61,7 +61,7 @@ fi %postun -p /sbin/ldconfig %clean -[ "%{buildroot}" != "/" ] && rm -rf %{buildroot} +rm -rf %{buildroot} %files -f %{name}.lang %defattr(-,root,root) @@ -83,6 +83,10 @@ fi %{_mandir}/man3/* %changelog +* Tue Nov 9 2004 Joe Orton 0.5.10-1 +- update to 0.5.10 +- buildroot cleanup fix (Robert Scheck) + * Mon Nov 8 2004 Joe Orton 0.5.9-1 - update to 0.5.9 (#138296) diff --git a/sources b/sources index 5b9b3ff..ee858a9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -295e939b47d5203134925a882315c495 libidn-0.5.9.tar.gz +655551b05db58561237e5649fac274f2 libidn-0.5.10.tar.gz diff --git a/upstream b/upstream index bb0a73e..22d1a74 100644 --- a/upstream +++ b/upstream @@ -1 +1 @@ -libidn-0.5.9.tar.gz +libidn-0.5.10.tar.gz From 3f5528b4dd82962d5bccfc1015f99722002a58fe Mon Sep 17 00:00:00 2001 From: jorton Date: Mon, 29 Nov 2004 09:43:17 +0000 Subject: [PATCH 015/157] - update to 0.5.11 (#141094) --- .cvsignore | 2 +- libidn.spec | 5 ++++- sources | 2 +- upstream | 2 +- 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.cvsignore b/.cvsignore index 22d1a74..a521da8 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -libidn-0.5.10.tar.gz +libidn-0.5.11.tar.gz diff --git a/libidn.spec b/libidn.spec index 02e7e1d..9e4044f 100644 --- a/libidn.spec +++ b/libidn.spec @@ -1,6 +1,6 @@ Summary: Internationalized Domain Name support library Name: libidn -Version: 0.5.10 +Version: 0.5.11 Release: 1 URL: http://www.gnu.org/software/libidn License: LGPL @@ -83,6 +83,9 @@ rm -rf %{buildroot} %{_mandir}/man3/* %changelog +* Mon Nov 29 2004 Joe Orton 0.5.11-1 +- update to 0.5.11 (#141094) + * Tue Nov 9 2004 Joe Orton 0.5.10-1 - update to 0.5.10 - buildroot cleanup fix (Robert Scheck) diff --git a/sources b/sources index ee858a9..e14b31c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -655551b05db58561237e5649fac274f2 libidn-0.5.10.tar.gz +e4f6ca9464ecbf2fc1e837869f2f3c8d libidn-0.5.11.tar.gz diff --git a/upstream b/upstream index 22d1a74..a521da8 100644 --- a/upstream +++ b/upstream @@ -1 +1 @@ -libidn-0.5.10.tar.gz +libidn-0.5.11.tar.gz From 49e6404044b4afb59dda90e0636b67984eaa9b0d Mon Sep 17 00:00:00 2001 From: jorton Date: Sun, 5 Dec 2004 22:54:13 +0000 Subject: [PATCH 016/157] - update to 0.5.12 --- .cvsignore | 2 +- libidn.spec | 5 ++++- sources | 2 +- upstream | 2 +- 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.cvsignore b/.cvsignore index a521da8..68df023 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -libidn-0.5.11.tar.gz +libidn-0.5.12.tar.gz diff --git a/libidn.spec b/libidn.spec index 9e4044f..9f0c24b 100644 --- a/libidn.spec +++ b/libidn.spec @@ -1,6 +1,6 @@ Summary: Internationalized Domain Name support library Name: libidn -Version: 0.5.11 +Version: 0.5.12 Release: 1 URL: http://www.gnu.org/software/libidn License: LGPL @@ -83,6 +83,9 @@ rm -rf %{buildroot} %{_mandir}/man3/* %changelog +* Sun Dec 5 2004 Joe Orton 0.5.12-1 +- update to 0.5.12 + * Mon Nov 29 2004 Joe Orton 0.5.11-1 - update to 0.5.11 (#141094) diff --git a/sources b/sources index e14b31c..004e3c1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e4f6ca9464ecbf2fc1e837869f2f3c8d libidn-0.5.11.tar.gz +0a75ffdec5b739e744bb14cb8d4b4ba3 libidn-0.5.12.tar.gz diff --git a/upstream b/upstream index a521da8..68df023 100644 --- a/upstream +++ b/upstream @@ -1 +1 @@ -libidn-0.5.11.tar.gz +libidn-0.5.12.tar.gz From 3f63f5133ebb7ea4fdc944a063ad8d7b273bd431 Mon Sep 17 00:00:00 2001 From: jorton Date: Mon, 31 Jan 2005 10:00:23 +0000 Subject: [PATCH 017/157] - update to 0.5.13 --- .cvsignore | 2 +- libidn.spec | 5 ++++- sources | 2 +- upstream | 2 +- 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.cvsignore b/.cvsignore index 68df023..ada82b1 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -libidn-0.5.12.tar.gz +libidn-0.5.13.tar.gz diff --git a/libidn.spec b/libidn.spec index 9f0c24b..6859a4d 100644 --- a/libidn.spec +++ b/libidn.spec @@ -1,6 +1,6 @@ Summary: Internationalized Domain Name support library Name: libidn -Version: 0.5.12 +Version: 0.5.13 Release: 1 URL: http://www.gnu.org/software/libidn License: LGPL @@ -83,6 +83,9 @@ rm -rf %{buildroot} %{_mandir}/man3/* %changelog +* Mon Jan 31 2005 Joe Orton 0.5.13-1 +- update to 0.5.13 + * Sun Dec 5 2004 Joe Orton 0.5.12-1 - update to 0.5.12 diff --git a/sources b/sources index 004e3c1..9abb528 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -0a75ffdec5b739e744bb14cb8d4b4ba3 libidn-0.5.12.tar.gz +733cddb52c40a5656053631d31fe3cc7 libidn-0.5.13.tar.gz diff --git a/upstream b/upstream index 68df023..ada82b1 100644 --- a/upstream +++ b/upstream @@ -1 +1 @@ -libidn-0.5.12.tar.gz +libidn-0.5.13.tar.gz From 913be702fc9d6113e97938e4922c9b0caf552b01 Mon Sep 17 00:00:00 2001 From: jorton Date: Fri, 4 Mar 2005 10:13:05 +0000 Subject: [PATCH 018/157] - rebuild --- libidn.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libidn.spec b/libidn.spec index 6859a4d..a2341f5 100644 --- a/libidn.spec +++ b/libidn.spec @@ -1,7 +1,7 @@ Summary: Internationalized Domain Name support library Name: libidn Version: 0.5.13 -Release: 1 +Release: 2 URL: http://www.gnu.org/software/libidn License: LGPL Source0: http://josefsson.org/libidn/releases/libidn-%{version}.tar.gz @@ -83,6 +83,9 @@ rm -rf %{buildroot} %{_mandir}/man3/* %changelog +* Fri Mar 4 2005 Joe Orton 0.5.13-2 +- rebuild + * Mon Jan 31 2005 Joe Orton 0.5.13-1 - update to 0.5.13 From f99fdeaeb40026d2757afac3dc4b52279ba4b899 Mon Sep 17 00:00:00 2001 From: jorton Date: Sun, 20 Mar 2005 09:41:19 +0000 Subject: [PATCH 019/157] - update to 0.5.15 --- .cvsignore | 2 +- libidn.spec | 7 +++++-- sources | 2 +- upstream | 2 +- 4 files changed, 8 insertions(+), 5 deletions(-) diff --git a/.cvsignore b/.cvsignore index ada82b1..eea5844 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -libidn-0.5.13.tar.gz +libidn-0.5.15.tar.gz diff --git a/libidn.spec b/libidn.spec index a2341f5..839a4e3 100644 --- a/libidn.spec +++ b/libidn.spec @@ -1,7 +1,7 @@ Summary: Internationalized Domain Name support library Name: libidn -Version: 0.5.13 -Release: 2 +Version: 0.5.15 +Release: 1 URL: http://www.gnu.org/software/libidn License: LGPL Source0: http://josefsson.org/libidn/releases/libidn-%{version}.tar.gz @@ -83,6 +83,9 @@ rm -rf %{buildroot} %{_mandir}/man3/* %changelog +* Sun Mar 20 2005 Joe Orton 0.5.15-1 +- update to 0.5.15 + * Fri Mar 4 2005 Joe Orton 0.5.13-2 - rebuild diff --git a/sources b/sources index 9abb528..528e13e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -733cddb52c40a5656053631d31fe3cc7 libidn-0.5.13.tar.gz +03d2c41aa6e74ab627a09b1f9f032280 libidn-0.5.15.tar.gz diff --git a/upstream b/upstream index ada82b1..eea5844 100644 --- a/upstream +++ b/upstream @@ -1 +1 @@ -libidn-0.5.13.tar.gz +libidn-0.5.15.tar.gz From e9dde0c5c6f1c4509051b9b420b19c38816ddd4f Mon Sep 17 00:00:00 2001 From: jorton Date: Thu, 5 May 2005 15:47:31 +0000 Subject: [PATCH 020/157] - constify data tables in pr29.c - clean up pre/post/postun requires --- libidn.spec | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/libidn.spec b/libidn.spec index 839a4e3..72991ee 100644 --- a/libidn.spec +++ b/libidn.spec @@ -1,14 +1,17 @@ Summary: Internationalized Domain Name support library Name: libidn Version: 0.5.15 -Release: 1 +Release: 2 URL: http://www.gnu.org/software/libidn License: LGPL Source0: http://josefsson.org/libidn/releases/libidn-%{version}.tar.gz +Patch0: libidn-0.5.15-pr29const.patch Group: System Environment/Libraries BuildRoot: %{_tmppath}/%{name}-%{version}-root BuildRequires: pkgconfig, gettext -Prereq: /sbin/ldconfig, /sbin/install-info +Requires(post): /sbin/install-info +Requires(postun): /sbin/ldconfig +Requires(pre): /sbin/ldconfig, /sbin/install-info %description GNU Libidn is an implementation of the Stringprep, Punycode and @@ -28,6 +31,7 @@ developing programs which use the GNU libidn library. %prep %setup -q +%patch0 -p1 -b .pr29const %build %configure @@ -83,6 +87,10 @@ rm -rf %{buildroot} %{_mandir}/man3/* %changelog +* Thu May 5 2005 Joe Orton 0.5.15-2 +- constify data tables in pr29.c +- clean up pre/post/postun requires + * Sun Mar 20 2005 Joe Orton 0.5.15-1 - update to 0.5.15 From fc2525bc5733737f1c4dacc96c2b30e04a5671c4 Mon Sep 17 00:00:00 2001 From: jorton Date: Fri, 6 May 2005 07:59:19 +0000 Subject: [PATCH 021/157] - update to 0.5.16 --- .cvsignore | 2 +- libidn.spec | 9 +++++---- sources | 2 +- upstream | 2 +- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/.cvsignore b/.cvsignore index eea5844..9f0287c 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -libidn-0.5.15.tar.gz +libidn-0.5.16.tar.gz diff --git a/libidn.spec b/libidn.spec index 72991ee..fa041ca 100644 --- a/libidn.spec +++ b/libidn.spec @@ -1,11 +1,10 @@ Summary: Internationalized Domain Name support library Name: libidn -Version: 0.5.15 -Release: 2 +Version: 0.5.16 +Release: 1 URL: http://www.gnu.org/software/libidn License: LGPL Source0: http://josefsson.org/libidn/releases/libidn-%{version}.tar.gz -Patch0: libidn-0.5.15-pr29const.patch Group: System Environment/Libraries BuildRoot: %{_tmppath}/%{name}-%{version}-root BuildRequires: pkgconfig, gettext @@ -31,7 +30,6 @@ developing programs which use the GNU libidn library. %prep %setup -q -%patch0 -p1 -b .pr29const %build %configure @@ -87,6 +85,9 @@ rm -rf %{buildroot} %{_mandir}/man3/* %changelog +* Fri May 6 2005 Joe Orton 0.5.16-1 +- update to 0.5.16 + * Thu May 5 2005 Joe Orton 0.5.15-2 - constify data tables in pr29.c - clean up pre/post/postun requires diff --git a/sources b/sources index 528e13e..c1421c4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -03d2c41aa6e74ab627a09b1f9f032280 libidn-0.5.15.tar.gz +3fd2287f277fb63c2cc05e95ca40bf0d libidn-0.5.16.tar.gz diff --git a/upstream b/upstream index eea5844..9f0287c 100644 --- a/upstream +++ b/upstream @@ -1 +1 @@ -libidn-0.5.15.tar.gz +libidn-0.5.16.tar.gz From 08d2fc8ea7d56c800852b5884fdb4b7a5cfcd0f3 Mon Sep 17 00:00:00 2001 From: jorton Date: Fri, 27 May 2005 08:58:16 +0000 Subject: [PATCH 022/157] - update to 0.5.17 --- .cvsignore | 2 +- libidn.spec | 5 ++++- sources | 2 +- upstream | 2 +- 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.cvsignore b/.cvsignore index 9f0287c..9200ea7 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -libidn-0.5.16.tar.gz +libidn-0.5.17.tar.gz diff --git a/libidn.spec b/libidn.spec index fa041ca..c77dd1d 100644 --- a/libidn.spec +++ b/libidn.spec @@ -1,6 +1,6 @@ Summary: Internationalized Domain Name support library Name: libidn -Version: 0.5.16 +Version: 0.5.17 Release: 1 URL: http://www.gnu.org/software/libidn License: LGPL @@ -85,6 +85,9 @@ rm -rf %{buildroot} %{_mandir}/man3/* %changelog +* Fri May 27 2005 Joe Orton 0.5.17-1 +- update to 0.5.17 + * Fri May 6 2005 Joe Orton 0.5.16-1 - update to 0.5.16 diff --git a/sources b/sources index c1421c4..f4130cd 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -3fd2287f277fb63c2cc05e95ca40bf0d libidn-0.5.16.tar.gz +cd890b571f2a27222052eac9dccb7c80 libidn-0.5.17.tar.gz diff --git a/upstream b/upstream index 9f0287c..9200ea7 100644 --- a/upstream +++ b/upstream @@ -1 +1 @@ -libidn-0.5.16.tar.gz +libidn-0.5.17.tar.gz From c2b2c72a3aced7b5d219ae11686bcb9c2b6bf32f Mon Sep 17 00:00:00 2001 From: jorton Date: Mon, 19 Sep 2005 17:41:33 +0000 Subject: [PATCH 023/157] - update to 0.5.19 --- .cvsignore | 2 +- libidn.spec | 5 ++++- sources | 2 +- upstream | 2 +- 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.cvsignore b/.cvsignore index 9200ea7..c29f3ef 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -libidn-0.5.17.tar.gz +libidn-0.5.19.tar.gz diff --git a/libidn.spec b/libidn.spec index c77dd1d..4dfc690 100644 --- a/libidn.spec +++ b/libidn.spec @@ -1,6 +1,6 @@ Summary: Internationalized Domain Name support library Name: libidn -Version: 0.5.17 +Version: 0.5.19 Release: 1 URL: http://www.gnu.org/software/libidn License: LGPL @@ -85,6 +85,9 @@ rm -rf %{buildroot} %{_mandir}/man3/* %changelog +* Mon Sep 19 2005 Joe Orton 0.5.19-1 +- update to 0.5.19 + * Fri May 27 2005 Joe Orton 0.5.17-1 - update to 0.5.17 diff --git a/sources b/sources index f4130cd..2f681f2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -cd890b571f2a27222052eac9dccb7c80 libidn-0.5.17.tar.gz +440835808c577073db7d571357223dce libidn-0.5.19.tar.gz diff --git a/upstream b/upstream index 9200ea7..c29f3ef 100644 --- a/upstream +++ b/upstream @@ -1 +1 @@ -libidn-0.5.17.tar.gz +libidn-0.5.19.tar.gz From 0ace3f782d63a6244d69a02b80490a2c5e5d7959 Mon Sep 17 00:00:00 2001 From: jorton Date: Mon, 24 Oct 2005 07:23:15 +0000 Subject: [PATCH 024/157] - update to 0.5.20 --- .cvsignore | 2 +- libidn.spec | 5 ++++- sources | 2 +- upstream | 2 +- 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.cvsignore b/.cvsignore index c29f3ef..9f26f02 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -libidn-0.5.19.tar.gz +libidn-0.5.20.tar.gz diff --git a/libidn.spec b/libidn.spec index 4dfc690..1c0c7da 100644 --- a/libidn.spec +++ b/libidn.spec @@ -1,6 +1,6 @@ Summary: Internationalized Domain Name support library Name: libidn -Version: 0.5.19 +Version: 0.5.20 Release: 1 URL: http://www.gnu.org/software/libidn License: LGPL @@ -85,6 +85,9 @@ rm -rf %{buildroot} %{_mandir}/man3/* %changelog +* Mon Oct 24 2005 Joe Orton 0.5.20-1 +- update to 0.5.20 + * Mon Sep 19 2005 Joe Orton 0.5.19-1 - update to 0.5.19 diff --git a/sources b/sources index 2f681f2..2266a6b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -440835808c577073db7d571357223dce libidn-0.5.19.tar.gz +b8ccbdf43b8da1722a6773c4e426d059 libidn-0.5.20.tar.gz diff --git a/upstream b/upstream index c29f3ef..9f26f02 100644 --- a/upstream +++ b/upstream @@ -1 +1 @@ -libidn-0.5.19.tar.gz +libidn-0.5.20.tar.gz From 6313d14e26451b2f050e2cdfad8541b8f499d730 Mon Sep 17 00:00:00 2001 From: jorton Date: Sun, 4 Dec 2005 15:46:40 +0000 Subject: [PATCH 025/157] - update to 0.6.0 --- .cvsignore | 3 ++- libidn.spec | 5 ++++- sources | 3 ++- upstream | 2 +- 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/.cvsignore b/.cvsignore index 9f26f02..af4ef98 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1,2 @@ -libidn-0.5.20.tar.gz +libidn-0.6.0.tar.gz + diff --git a/libidn.spec b/libidn.spec index 1c0c7da..93c2f66 100644 --- a/libidn.spec +++ b/libidn.spec @@ -1,6 +1,6 @@ Summary: Internationalized Domain Name support library Name: libidn -Version: 0.5.20 +Version: 0.6.0 Release: 1 URL: http://www.gnu.org/software/libidn License: LGPL @@ -85,6 +85,9 @@ rm -rf %{buildroot} %{_mandir}/man3/* %changelog +* Sun Dec 4 2005 Joe Orton 0.6.0-1 +- update to 0.6.0 + * Mon Oct 24 2005 Joe Orton 0.5.20-1 - update to 0.5.20 diff --git a/sources b/sources index 2266a6b..41fecc1 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ -b8ccbdf43b8da1722a6773c4e426d059 libidn-0.5.20.tar.gz +4991ab5ce647c89fa4812d9a1700a8f6 libidn-0.6.0.tar.gz + diff --git a/upstream b/upstream index 9f26f02..fa0ff8a 100644 --- a/upstream +++ b/upstream @@ -1 +1 @@ -libidn-0.5.20.tar.gz +libidn-0.6.0.tar.gz From 2a5ebe8eb42768cc5a1d5ac9418258c235c93db3 Mon Sep 17 00:00:00 2001 From: jorton Date: Sun, 4 Dec 2005 15:46:54 +0000 Subject: [PATCH 026/157] Remove blank line. --- sources | 1 - 1 file changed, 1 deletion(-) diff --git a/sources b/sources index 41fecc1..a22824c 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ 4991ab5ce647c89fa4812d9a1700a8f6 libidn-0.6.0.tar.gz - From 32beb88650fb3eac9aa4561da9fe869c7f06f295 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Fri, 9 Dec 2005 22:41:36 +0000 Subject: [PATCH 027/157] gcc update bump --- libidn.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libidn.spec b/libidn.spec index 93c2f66..24c22c0 100644 --- a/libidn.spec +++ b/libidn.spec @@ -1,7 +1,7 @@ Summary: Internationalized Domain Name support library Name: libidn Version: 0.6.0 -Release: 1 +Release: 1.1 URL: http://www.gnu.org/software/libidn License: LGPL Source0: http://josefsson.org/libidn/releases/libidn-%{version}.tar.gz @@ -85,6 +85,9 @@ rm -rf %{buildroot} %{_mandir}/man3/* %changelog +* Fri Dec 09 2005 Jesse Keating +- rebuilt + * Sun Dec 4 2005 Joe Orton 0.6.0-1 - update to 0.6.0 From de752bcffc14954c8b86645095b075f736111e38 Mon Sep 17 00:00:00 2001 From: Florian La Roche Date: Mon, 6 Feb 2006 08:55:58 +0000 Subject: [PATCH 028/157] - 0.6.1 --- .cvsignore | 3 +-- libidn.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/.cvsignore b/.cvsignore index af4ef98..7a8147d 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1 @@ -libidn-0.6.0.tar.gz - +libidn-0.6.1.tar.gz diff --git a/libidn.spec b/libidn.spec index 24c22c0..ce1d75b 100644 --- a/libidn.spec +++ b/libidn.spec @@ -1,7 +1,7 @@ Summary: Internationalized Domain Name support library Name: libidn -Version: 0.6.0 -Release: 1.1 +Version: 0.6.1 +Release: 1 URL: http://www.gnu.org/software/libidn License: LGPL Source0: http://josefsson.org/libidn/releases/libidn-%{version}.tar.gz @@ -85,6 +85,9 @@ rm -rf %{buildroot} %{_mandir}/man3/* %changelog +* Mon Feb 06 2006 Florian La Roche +- 0.6.1 + * Fri Dec 09 2005 Jesse Keating - rebuilt diff --git a/sources b/sources index a22824c..627b886 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -4991ab5ce647c89fa4812d9a1700a8f6 libidn-0.6.0.tar.gz +7634c115a747ba0c9b7109553dcfc6c6 libidn-0.6.1.tar.gz From 5f83bc3c85756bcfecef13d012b41dfabdd6dc1c Mon Sep 17 00:00:00 2001 From: Florian La Roche Date: Tue, 7 Feb 2006 11:16:53 +0000 Subject: [PATCH 029/157] - 0.6.2 --- .cvsignore | 1 + libidn.spec | 2 +- sources | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.cvsignore b/.cvsignore index 7a8147d..7f7dae2 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1,2 @@ libidn-0.6.1.tar.gz +libidn-0.6.2.tar.gz diff --git a/libidn.spec b/libidn.spec index ce1d75b..e81f8ce 100644 --- a/libidn.spec +++ b/libidn.spec @@ -1,6 +1,6 @@ Summary: Internationalized Domain Name support library Name: libidn -Version: 0.6.1 +Version: 0.6.2 Release: 1 URL: http://www.gnu.org/software/libidn License: LGPL diff --git a/sources b/sources index 627b886..3827b96 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -7634c115a747ba0c9b7109553dcfc6c6 libidn-0.6.1.tar.gz +b1a771ed18b1ed4b83478a78057134bb libidn-0.6.2.tar.gz From 5d04e400a40fb6ec932d4fd19a0de4a3669e2563 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Sat, 11 Feb 2006 04:08:51 +0000 Subject: [PATCH 030/157] bump for bug in double-long on ppc(64) --- libidn.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libidn.spec b/libidn.spec index e81f8ce..e8360e2 100644 --- a/libidn.spec +++ b/libidn.spec @@ -1,7 +1,7 @@ Summary: Internationalized Domain Name support library Name: libidn Version: 0.6.2 -Release: 1 +Release: 1.1 URL: http://www.gnu.org/software/libidn License: LGPL Source0: http://josefsson.org/libidn/releases/libidn-%{version}.tar.gz @@ -85,6 +85,9 @@ rm -rf %{buildroot} %{_mandir}/man3/* %changelog +* Fri Feb 10 2006 Jesse Keating - 0.6.2-1.1 +- bump again for double-long bug on ppc(64) + * Mon Feb 06 2006 Florian La Roche - 0.6.1 From f7a5e283a8e427e4209b26c7d72b8af05ae32e24 Mon Sep 17 00:00:00 2001 From: jorton Date: Wed, 22 Feb 2006 10:05:03 +0000 Subject: [PATCH 031/157] - disable C# support (#182393) --- libidn.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/libidn.spec b/libidn.spec index e8360e2..68f60d4 100644 --- a/libidn.spec +++ b/libidn.spec @@ -1,7 +1,7 @@ Summary: Internationalized Domain Name support library Name: libidn Version: 0.6.2 -Release: 1.1 +Release: 2 URL: http://www.gnu.org/software/libidn License: LGPL Source0: http://josefsson.org/libidn/releases/libidn-%{version}.tar.gz @@ -32,7 +32,7 @@ developing programs which use the GNU libidn library. %setup -q %build -%configure +%configure --disable-csharp make %{?_smp_mflags} %check @@ -85,6 +85,9 @@ rm -rf %{buildroot} %{_mandir}/man3/* %changelog +* Wed Feb 22 2006 Joe Orton 0.6.2-2 +- disable C# support (#182393) + * Fri Feb 10 2006 Jesse Keating - 0.6.2-1.1 - bump again for double-long bug on ppc(64) From 7378b95800b9616355642da15279cf1ff064edc2 Mon Sep 17 00:00:00 2001 From: jorton Date: Thu, 11 May 2006 11:08:29 +0000 Subject: [PATCH 032/157] - make idn-int.h multilib-safe --- libidn.spec | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/libidn.spec b/libidn.spec index 68f60d4..d2e7a7a 100644 --- a/libidn.spec +++ b/libidn.spec @@ -1,7 +1,7 @@ Summary: Internationalized Domain Name support library Name: libidn Version: 0.6.2 -Release: 2 +Release: 3 URL: http://www.gnu.org/software/libidn License: LGPL Source0: http://josefsson.org/libidn/releases/libidn-%{version}.tar.gz @@ -49,6 +49,9 @@ make %{?_smp_mflags} -C examples distclean find doc -name "Makefile*" | xargs rm rm -rf $RPM_BUILD_ROOT%{_datadir}/info/dir +# Make multilib safe: +sed -i '/gnu compiler/d' $RPM_BUILD_ROOT%{_includedir}/idn-int.h + %find_lang %{name} %post @@ -85,6 +88,9 @@ rm -rf %{buildroot} %{_mandir}/man3/* %changelog +* Thu May 11 2006 Joe Orton 0.6.2-3 +- make idn-int.h multilib-safe + * Wed Feb 22 2006 Joe Orton 0.6.2-2 - disable C# support (#182393) From 0ffb5482e90f771ee08871af3895d87f1450d27b Mon Sep 17 00:00:00 2001 From: jorton Date: Thu, 1 Jun 2006 10:26:06 +0000 Subject: [PATCH 033/157] - remove the libidn.la (#172639) --- libidn.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/libidn.spec b/libidn.spec index d2e7a7a..0f299e3 100644 --- a/libidn.spec +++ b/libidn.spec @@ -52,6 +52,8 @@ rm -rf $RPM_BUILD_ROOT%{_datadir}/info/dir # Make multilib safe: sed -i '/gnu compiler/d' $RPM_BUILD_ROOT%{_includedir}/idn-int.h +rm -f $RPM_BUILD_ROOT%{_libdir}/*.la + %find_lang %{name} %post @@ -75,7 +77,6 @@ rm -rf %{buildroot} %{_mandir}/man1/idn.1* %{_datadir}/emacs/site-lisp %{_libdir}/libidn.so.* -%{_libdir}/libidn.la %{_infodir}/%{name}.info.gz %files devel @@ -88,6 +89,9 @@ rm -rf %{buildroot} %{_mandir}/man3/* %changelog +* Thu Jun 1 2006 Joe Orton 0.6.2-3 +- remove the libidn.la (#172639) + * Thu May 11 2006 Joe Orton 0.6.2-3 - make idn-int.h multilib-safe From 0e91845225640795580a2056233fa8def2e0e81a Mon Sep 17 00:00:00 2001 From: jorton Date: Thu, 1 Jun 2006 10:27:19 +0000 Subject: [PATCH 034/157] - bump the release --- libidn.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libidn.spec b/libidn.spec index 0f299e3..ba70958 100644 --- a/libidn.spec +++ b/libidn.spec @@ -1,7 +1,7 @@ Summary: Internationalized Domain Name support library Name: libidn Version: 0.6.2 -Release: 3 +Release: 4 URL: http://www.gnu.org/software/libidn License: LGPL Source0: http://josefsson.org/libidn/releases/libidn-%{version}.tar.gz @@ -89,7 +89,7 @@ rm -rf %{buildroot} %{_mandir}/man3/* %changelog -* Thu Jun 1 2006 Joe Orton 0.6.2-3 +* Thu Jun 1 2006 Joe Orton 0.6.2-4 - remove the libidn.la (#172639) * Thu May 11 2006 Joe Orton 0.6.2-3 From 339b825ef4911a95c604012fcbefe9be66beeffc Mon Sep 17 00:00:00 2001 From: jorton Date: Thu, 1 Jun 2006 12:13:25 +0000 Subject: [PATCH 035/157] - update to 0.6.3 - fix some places where gettext() was not getting used --- .cvsignore | 3 +-- libidn.spec | 10 ++++++++-- sources | 2 +- upstream | 2 +- 4 files changed, 11 insertions(+), 6 deletions(-) diff --git a/.cvsignore b/.cvsignore index 7f7dae2..43e96b0 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1 @@ -libidn-0.6.1.tar.gz -libidn-0.6.2.tar.gz +libidn-0.6.3.tar.gz diff --git a/libidn.spec b/libidn.spec index ba70958..349ef07 100644 --- a/libidn.spec +++ b/libidn.spec @@ -1,10 +1,11 @@ Summary: Internationalized Domain Name support library Name: libidn -Version: 0.6.2 -Release: 4 +Version: 0.6.3 +Release: 1 URL: http://www.gnu.org/software/libidn License: LGPL Source0: http://josefsson.org/libidn/releases/libidn-%{version}.tar.gz +Patch0: libidn-0.6.2-configdoth.patch Group: System Environment/Libraries BuildRoot: %{_tmppath}/%{name}-%{version}-root BuildRequires: pkgconfig, gettext @@ -30,6 +31,7 @@ developing programs which use the GNU libidn library. %prep %setup -q +%patch0 -p1 -b .configdoth %build %configure --disable-csharp @@ -89,6 +91,10 @@ rm -rf %{buildroot} %{_mandir}/man3/* %changelog +* Thu Jun 1 2006 Joe Orton 0.6.3-1 +- update to 0.6.3 +- fix some places where gettext() was not getting used + * Thu Jun 1 2006 Joe Orton 0.6.2-4 - remove the libidn.la (#172639) diff --git a/sources b/sources index 3827b96..01171cc 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b1a771ed18b1ed4b83478a78057134bb libidn-0.6.2.tar.gz +d240631c93c7d3a0e93cdf66f536073f libidn-0.6.3.tar.gz diff --git a/upstream b/upstream index fa0ff8a..43e96b0 100644 --- a/upstream +++ b/upstream @@ -1 +1 @@ -libidn-0.6.0.tar.gz +libidn-0.6.3.tar.gz From 22bd209b92df0a110c501bc73acbf13d565613ab Mon Sep 17 00:00:00 2001 From: jorton Date: Fri, 7 Jul 2006 09:35:46 +0000 Subject: [PATCH 036/157] - update to 0.6.4 --- .cvsignore | 5 ++++- libidn.spec | 7 ++++--- sources | 2 +- upstream | 2 +- 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/.cvsignore b/.cvsignore index 43e96b0..78400ad 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1,4 @@ -libidn-0.6.3.tar.gz +libidn-0.6.4.tar.gz +*.rpm +x86_64 +clog diff --git a/libidn.spec b/libidn.spec index 349ef07..f198bac 100644 --- a/libidn.spec +++ b/libidn.spec @@ -1,11 +1,10 @@ Summary: Internationalized Domain Name support library Name: libidn -Version: 0.6.3 +Version: 0.6.4 Release: 1 URL: http://www.gnu.org/software/libidn License: LGPL Source0: http://josefsson.org/libidn/releases/libidn-%{version}.tar.gz -Patch0: libidn-0.6.2-configdoth.patch Group: System Environment/Libraries BuildRoot: %{_tmppath}/%{name}-%{version}-root BuildRequires: pkgconfig, gettext @@ -31,7 +30,6 @@ developing programs which use the GNU libidn library. %prep %setup -q -%patch0 -p1 -b .configdoth %build %configure --disable-csharp @@ -91,6 +89,9 @@ rm -rf %{buildroot} %{_mandir}/man3/* %changelog +* Fri Jul 7 2006 Joe Orton 0.6.4-1 +- update to 0.6.4 + * Thu Jun 1 2006 Joe Orton 0.6.3-1 - update to 0.6.3 - fix some places where gettext() was not getting used diff --git a/sources b/sources index 01171cc..61c7d0e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d240631c93c7d3a0e93cdf66f536073f libidn-0.6.3.tar.gz +43b53d7bab03e9b156232850e7ccc5c9 libidn-0.6.4.tar.gz diff --git a/upstream b/upstream index 43e96b0..e00387c 100644 --- a/upstream +++ b/upstream @@ -1 +1 @@ -libidn-0.6.3.tar.gz +libidn-0.6.4.tar.gz From 58425b9fce48f07183a3b5979898e211acae9390 Mon Sep 17 00:00:00 2001 From: jorton Date: Fri, 7 Jul 2006 13:48:40 +0000 Subject: [PATCH 037/157] - update to 0.6.5 --- .cvsignore | 5 +---- libidn.spec | 5 ++++- sources | 2 +- upstream | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.cvsignore b/.cvsignore index 78400ad..d495945 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,4 +1 @@ -libidn-0.6.4.tar.gz -*.rpm -x86_64 -clog +libidn-0.6.5.tar.gz diff --git a/libidn.spec b/libidn.spec index f198bac..ad8e772 100644 --- a/libidn.spec +++ b/libidn.spec @@ -1,6 +1,6 @@ Summary: Internationalized Domain Name support library Name: libidn -Version: 0.6.4 +Version: 0.6.5 Release: 1 URL: http://www.gnu.org/software/libidn License: LGPL @@ -89,6 +89,9 @@ rm -rf %{buildroot} %{_mandir}/man3/* %changelog +* Fri Jul 7 2006 Joe Orton 0.6.5-1 +- update to 0.6.5 + * Fri Jul 7 2006 Joe Orton 0.6.4-1 - update to 0.6.4 diff --git a/sources b/sources index 61c7d0e..7f07c4c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -43b53d7bab03e9b156232850e7ccc5c9 libidn-0.6.4.tar.gz +86ccf6f9e21753a2d070e44ea3c2c224 libidn-0.6.5.tar.gz diff --git a/upstream b/upstream index e00387c..d495945 100644 --- a/upstream +++ b/upstream @@ -1 +1 @@ -libidn-0.6.4.tar.gz +libidn-0.6.5.tar.gz From eab15186eaf6f1e67a0f7a8fc71dcb42e3f5bacd Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Wed, 12 Jul 2006 06:53:42 +0000 Subject: [PATCH 038/157] bumped for rebuild --- libidn.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libidn.spec b/libidn.spec index ad8e772..ca48310 100644 --- a/libidn.spec +++ b/libidn.spec @@ -1,7 +1,7 @@ Summary: Internationalized Domain Name support library Name: libidn Version: 0.6.5 -Release: 1 +Release: 1.1 URL: http://www.gnu.org/software/libidn License: LGPL Source0: http://josefsson.org/libidn/releases/libidn-%{version}.tar.gz @@ -89,6 +89,9 @@ rm -rf %{buildroot} %{_mandir}/man3/* %changelog +* Wed Jul 12 2006 Jesse Keating - 0.6.5-1.1 +- rebuild + * Fri Jul 7 2006 Joe Orton 0.6.5-1 - update to 0.6.5 From 54df87f4b672edcc34f7023ef220c65973819009 Mon Sep 17 00:00:00 2001 From: jorton Date: Wed, 15 Nov 2006 15:00:09 +0000 Subject: [PATCH 039/157] - update to 0.6.8 --- .cvsignore | 2 +- libidn-0.6.8.tar.gz.sig | 10 ++++++++++ libidn.spec | 7 +++++-- sources | 2 +- upstream | 2 +- 5 files changed, 18 insertions(+), 5 deletions(-) create mode 100644 libidn-0.6.8.tar.gz.sig diff --git a/.cvsignore b/.cvsignore index d495945..43cfb1b 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -libidn-0.6.5.tar.gz +libidn-0.6.8.tar.gz diff --git a/libidn-0.6.8.tar.gz.sig b/libidn-0.6.8.tar.gz.sig new file mode 100644 index 0000000..b249e94 --- /dev/null +++ b/libidn-0.6.8.tar.gz.sig @@ -0,0 +1,10 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.5 (GNU/Linux) + +iOoEAAECADQFAkU2KT8tFIAAAAAAFQAPcGthLWFkZHJlc3NAZ251cGcub3JnamFz +QGV4dHVuZG8uY29tAAoJEO2iHpS1ZXFv1G8E/1WcMEhnA9UfgsVfG2RhEIMbDtvw +DuDTAfEAgfc2ZZgWwugVfUMclBTX6M+8766NV5hwzmV5tmGEEmn/WMtFAUm0OAm+ +YxE1pcfY/31pFCGXpAeHVwYeyBHjSCnIwsZ+gSZBjiLio5aWNJ1KAnT/wNg5R6pX +LMX6lKC5qBICn1t/W9hMLPTTA8Hp0o13pN74iM/kR5no/zQ894Xz6NfGEt4= +=hBTH +-----END PGP SIGNATURE----- diff --git a/libidn.spec b/libidn.spec index ca48310..c55c4be 100644 --- a/libidn.spec +++ b/libidn.spec @@ -1,7 +1,7 @@ Summary: Internationalized Domain Name support library Name: libidn -Version: 0.6.5 -Release: 1.1 +Version: 0.6.8 +Release: 2 URL: http://www.gnu.org/software/libidn License: LGPL Source0: http://josefsson.org/libidn/releases/libidn-%{version}.tar.gz @@ -89,6 +89,9 @@ rm -rf %{buildroot} %{_mandir}/man3/* %changelog +* Wed Nov 15 2006 Joe Orton 0.6.8-2 +- update to 0.6.8 + * Wed Jul 12 2006 Jesse Keating - 0.6.5-1.1 - rebuild diff --git a/sources b/sources index 7f07c4c..84a9c5b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -86ccf6f9e21753a2d070e44ea3c2c224 libidn-0.6.5.tar.gz +5d1a2e42f91c1d53376ec37557601d47 libidn-0.6.8.tar.gz diff --git a/upstream b/upstream index d495945..43cfb1b 100644 --- a/upstream +++ b/upstream @@ -1 +1 @@ -libidn-0.6.5.tar.gz +libidn-0.6.8.tar.gz From c2a00928c2e4fe0bb0278ebf0e8e2852153328f2 Mon Sep 17 00:00:00 2001 From: jorton Date: Wed, 15 Nov 2006 15:00:55 +0000 Subject: [PATCH 040/157] - bump release --- libidn.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libidn.spec b/libidn.spec index c55c4be..517bce2 100644 --- a/libidn.spec +++ b/libidn.spec @@ -1,7 +1,7 @@ Summary: Internationalized Domain Name support library Name: libidn Version: 0.6.8 -Release: 2 +Release: 3 URL: http://www.gnu.org/software/libidn License: LGPL Source0: http://josefsson.org/libidn/releases/libidn-%{version}.tar.gz @@ -89,7 +89,7 @@ rm -rf %{buildroot} %{_mandir}/man3/* %changelog -* Wed Nov 15 2006 Joe Orton 0.6.8-2 +* Wed Nov 15 2006 Joe Orton 0.6.8-3 - update to 0.6.8 * Wed Jul 12 2006 Jesse Keating - 0.6.5-1.1 From d1f6569778d2982df620f618c16e7c7c2e37d7ae Mon Sep 17 00:00:00 2001 From: jorton Date: Wed, 15 Nov 2006 15:55:28 +0000 Subject: [PATCH 041/157] - use non-GNU section in info directory (#209491) --- libidn.spec | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/libidn.spec b/libidn.spec index 517bce2..6f7f605 100644 --- a/libidn.spec +++ b/libidn.spec @@ -1,7 +1,7 @@ Summary: Internationalized Domain Name support library Name: libidn Version: 0.6.8 -Release: 3 +Release: 4 URL: http://www.gnu.org/software/libidn License: LGPL Source0: http://josefsson.org/libidn/releases/libidn-%{version}.tar.gz @@ -31,6 +31,9 @@ developing programs which use the GNU libidn library. %prep %setup -q +# Name directory sections consistently in the info file, #209491 +sed -i '/^INFO-DIR-SECTION/{s/GNU Libraries/Libraries/;s/GNU utilities/Utilities/;}' doc/libidn.info + %build %configure --disable-csharp make %{?_smp_mflags} @@ -89,6 +92,9 @@ rm -rf %{buildroot} %{_mandir}/man3/* %changelog +* Wed Nov 15 2006 Joe Orton 0.6.8-4 +- use non-GNU section in info directory (#209491) + * Wed Nov 15 2006 Joe Orton 0.6.8-3 - update to 0.6.8 From 9cf161bbb59dbd0b3c57dc917ef06a768ab630ab Mon Sep 17 00:00:00 2001 From: jorton Date: Mon, 29 Jan 2007 09:59:57 +0000 Subject: [PATCH 042/157] =?UTF-8?q?-=20update=20to=200.6.9=20-=20make=20in?= =?UTF-8?q?stall-info=20use=20failsafe=20(Ville=20Skytt=C3=A4,=20#223707)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .cvsignore | 4 +++- libidn-0.6.9.tar.gz.sig | 10 ++++++++++ libidn.spec | 13 +++++++++---- sources | 2 +- upstream | 2 +- 5 files changed, 24 insertions(+), 7 deletions(-) create mode 100644 libidn-0.6.9.tar.gz.sig diff --git a/.cvsignore b/.cvsignore index 43cfb1b..980bc82 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1,3 @@ -libidn-0.6.8.tar.gz +libidn-0.6.9.tar.gz +libidn-0.6.9 +x86_64 diff --git a/libidn-0.6.9.tar.gz.sig b/libidn-0.6.9.tar.gz.sig new file mode 100644 index 0000000..d576f87 --- /dev/null +++ b/libidn-0.6.9.tar.gz.sig @@ -0,0 +1,10 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.5 (GNU/Linux) + +iOoEAAECADQFAkVuyQ8tFIAAAAAAFQAPcGthLWFkZHJlc3NAZ251cGcub3JnamFz +QGV4dHVuZG8uY29tAAoJEO2iHpS1ZXFvWa0FAKRtf/xl4yN4nt+9l8kER0WP3xSE +GbOgvBn9qLiHxh+EBBa7ICzd8O2gU+32ajfrILy18+jrdoFnAAe1eioga2J3guEM +jykgIEqYtx+3cu28UFdjQcC10wnWbW5Hl9vf2XKwV8tYAOEhc80mZspRfZ4aWUCh +Dow6FdAFadkvUQL2WXACK96kTT4tlV60cSuKvkNa54Vix1XwRspxVjv4vxo= +=DzHe +-----END PGP SIGNATURE----- diff --git a/libidn.spec b/libidn.spec index 6f7f605..ef6b470 100644 --- a/libidn.spec +++ b/libidn.spec @@ -1,7 +1,7 @@ Summary: Internationalized Domain Name support library Name: libidn -Version: 0.6.8 -Release: 4 +Version: 0.6.9 +Release: 2 URL: http://www.gnu.org/software/libidn License: LGPL Source0: http://josefsson.org/libidn/releases/libidn-%{version}.tar.gz @@ -9,8 +9,9 @@ Group: System Environment/Libraries BuildRoot: %{_tmppath}/%{name}-%{version}-root BuildRequires: pkgconfig, gettext Requires(post): /sbin/install-info +Requires(preun): /sbin/install-info Requires(postun): /sbin/ldconfig -Requires(pre): /sbin/ldconfig, /sbin/install-info +Requires(pre): /sbin/ldconfig %description GNU Libidn is an implementation of the Stringprep, Punycode and @@ -65,7 +66,7 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la %preun if [ $1 = 0 ]; then - /sbin/install-info --delete %{_infodir}/%{name}.info.gz %{_infodir}/dir + /sbin/install-info --delete %{_infodir}/%{name}.info.gz %{_infodir}/dir || : fi %postun -p /sbin/ldconfig @@ -92,6 +93,10 @@ rm -rf %{buildroot} %{_mandir}/man3/* %changelog +* Mon Jan 29 2007 Joe Orton 0.6.9-2 +- update to 0.6.9 +- make install-info use failsafe (Ville Skyttä, #223707) + * Wed Nov 15 2006 Joe Orton 0.6.8-4 - use non-GNU section in info directory (#209491) diff --git a/sources b/sources index 84a9c5b..ee9a193 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -5d1a2e42f91c1d53376ec37557601d47 libidn-0.6.8.tar.gz +616135837f5aaa9fac752e6b54221fb3 libidn-0.6.9.tar.gz diff --git a/upstream b/upstream index 43cfb1b..4af7001 100644 --- a/upstream +++ b/upstream @@ -1 +1 @@ -libidn-0.6.8.tar.gz +libidn-0.6.9.tar.gz From 7c04ebd53bf7cc949bdb351306045419a3d5f5b2 Mon Sep 17 00:00:00 2001 From: jorton Date: Thu, 26 Jul 2007 13:51:41 +0000 Subject: [PATCH 043/157] - update to 0.6.14 --- .cvsignore | 5 +++-- libidn-0.6.14.tar.gz.sig | 10 ++++++++++ libidn-0.6.8.tar.gz.sig | 10 ---------- libidn-0.6.9.tar.gz.sig | 10 ---------- libidn.spec | 8 ++++++-- sources | 2 +- upstream | 2 +- 7 files changed, 21 insertions(+), 26 deletions(-) create mode 100644 libidn-0.6.14.tar.gz.sig delete mode 100644 libidn-0.6.8.tar.gz.sig delete mode 100644 libidn-0.6.9.tar.gz.sig diff --git a/.cvsignore b/.cvsignore index 980bc82..75a56d3 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,3 +1,4 @@ -libidn-0.6.9.tar.gz -libidn-0.6.9 +libidn-0.6.14.tar.gz +libidn-0.6.14 x86_64 +clog diff --git a/libidn-0.6.14.tar.gz.sig b/libidn-0.6.14.tar.gz.sig new file mode 100644 index 0000000..cb9c70d --- /dev/null +++ b/libidn-0.6.14.tar.gz.sig @@ -0,0 +1,10 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.6 (GNU/Linux) + +iOoEAAECADQFAkZeqf8tFIAAAAAAFQAPcGthLWFkZHJlc3NAZ251cGcub3JnamFz +QGV4dHVuZG8uY29tAAoJEO2iHpS1ZXFvAPgE/1NO2c/V79+87KlTtXosfPXyU14I +cZ7UA6Boe2kqQXJ0XNW631kJQbBAiTJQmYZXIljDA3ikIq06rtbhh5bLzpMnfKhZ +kYlr7Ja1bzzuQis8AbAbAeZBa0FRCMu8JuN9yC7yANZS3FiMJqcVINKLEv9eRfxX +xiVpYajqEMjDbt4Y0Sl7/KjhLMQmAzI9qd2Kq6MyFyGbVTIhBAs2tFmcZI0= +=Smlw +-----END PGP SIGNATURE----- diff --git a/libidn-0.6.8.tar.gz.sig b/libidn-0.6.8.tar.gz.sig deleted file mode 100644 index b249e94..0000000 --- a/libidn-0.6.8.tar.gz.sig +++ /dev/null @@ -1,10 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.5 (GNU/Linux) - -iOoEAAECADQFAkU2KT8tFIAAAAAAFQAPcGthLWFkZHJlc3NAZ251cGcub3JnamFz -QGV4dHVuZG8uY29tAAoJEO2iHpS1ZXFv1G8E/1WcMEhnA9UfgsVfG2RhEIMbDtvw -DuDTAfEAgfc2ZZgWwugVfUMclBTX6M+8766NV5hwzmV5tmGEEmn/WMtFAUm0OAm+ -YxE1pcfY/31pFCGXpAeHVwYeyBHjSCnIwsZ+gSZBjiLio5aWNJ1KAnT/wNg5R6pX -LMX6lKC5qBICn1t/W9hMLPTTA8Hp0o13pN74iM/kR5no/zQ894Xz6NfGEt4= -=hBTH ------END PGP SIGNATURE----- diff --git a/libidn-0.6.9.tar.gz.sig b/libidn-0.6.9.tar.gz.sig deleted file mode 100644 index d576f87..0000000 --- a/libidn-0.6.9.tar.gz.sig +++ /dev/null @@ -1,10 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.5 (GNU/Linux) - -iOoEAAECADQFAkVuyQ8tFIAAAAAAFQAPcGthLWFkZHJlc3NAZ251cGcub3JnamFz -QGV4dHVuZG8uY29tAAoJEO2iHpS1ZXFvWa0FAKRtf/xl4yN4nt+9l8kER0WP3xSE -GbOgvBn9qLiHxh+EBBa7ICzd8O2gU+32ajfrILy18+jrdoFnAAe1eioga2J3guEM -jykgIEqYtx+3cu28UFdjQcC10wnWbW5Hl9vf2XKwV8tYAOEhc80mZspRfZ4aWUCh -Dow6FdAFadkvUQL2WXACK96kTT4tlV60cSuKvkNa54Vix1XwRspxVjv4vxo= -=DzHe ------END PGP SIGNATURE----- diff --git a/libidn.spec b/libidn.spec index ef6b470..92f3101 100644 --- a/libidn.spec +++ b/libidn.spec @@ -1,6 +1,6 @@ Summary: Internationalized Domain Name support library Name: libidn -Version: 0.6.9 +Version: 0.6.14 Release: 2 URL: http://www.gnu.org/software/libidn License: LGPL @@ -56,7 +56,8 @@ rm -rf $RPM_BUILD_ROOT%{_datadir}/info/dir # Make multilib safe: sed -i '/gnu compiler/d' $RPM_BUILD_ROOT%{_includedir}/idn-int.h -rm -f $RPM_BUILD_ROOT%{_libdir}/*.la +rm -f $RPM_BUILD_ROOT%{_libdir}/*.la \ + $RPM_BUILD_ROOT%{_datadir}/info/*.png %find_lang %{name} @@ -93,6 +94,9 @@ rm -rf %{buildroot} %{_mandir}/man3/* %changelog +* Mon Jun 18 2007 Joe Orton 0.6.14-2 +- update to 0.6.14 + * Mon Jan 29 2007 Joe Orton 0.6.9-2 - update to 0.6.9 - make install-info use failsafe (Ville Skyttä, #223707) diff --git a/sources b/sources index ee9a193..08cf30c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -616135837f5aaa9fac752e6b54221fb3 libidn-0.6.9.tar.gz +040f012a45feb56168853998bb87ad4d libidn-0.6.14.tar.gz diff --git a/upstream b/upstream index 4af7001..2e2fd4d 100644 --- a/upstream +++ b/upstream @@ -1 +1 @@ -libidn-0.6.9.tar.gz +libidn-0.6.14.tar.gz From 9571784927d8e1b670832e7aba328668ca46649c Mon Sep 17 00:00:00 2001 From: jorton Date: Mon, 20 Aug 2007 10:38:22 +0000 Subject: [PATCH 044/157] - fix License --- libidn.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/libidn.spec b/libidn.spec index 92f3101..e39a613 100644 --- a/libidn.spec +++ b/libidn.spec @@ -1,9 +1,9 @@ Summary: Internationalized Domain Name support library Name: libidn Version: 0.6.14 -Release: 2 +Release: 3 URL: http://www.gnu.org/software/libidn -License: LGPL +License: LGPLv2+ Source0: http://josefsson.org/libidn/releases/libidn-%{version}.tar.gz Group: System Environment/Libraries BuildRoot: %{_tmppath}/%{name}-%{version}-root @@ -94,6 +94,9 @@ rm -rf %{buildroot} %{_mandir}/man3/* %changelog +* Mon Aug 20 2007 Joe Orton 0.6.14-3 +- fix License + * Mon Jun 18 2007 Joe Orton 0.6.14-2 - update to 0.6.14 From e00c321fda8b404763850a4c815789be6bf2629b Mon Sep 17 00:00:00 2001 From: jorton Date: Tue, 21 Aug 2007 13:07:33 +0000 Subject: [PATCH 045/157] - drop contrib directory from docs --- libidn.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/libidn.spec b/libidn.spec index e39a613..a8d924f 100644 --- a/libidn.spec +++ b/libidn.spec @@ -1,7 +1,7 @@ Summary: Internationalized Domain Name support library Name: libidn Version: 0.6.14 -Release: 3 +Release: 4 URL: http://www.gnu.org/software/libidn License: LGPLv2+ Source0: http://josefsson.org/libidn/releases/libidn-%{version}.tar.gz @@ -86,7 +86,7 @@ rm -rf %{buildroot} %files devel %defattr(0644,root,root,755) -%doc doc/libidn.html examples contrib +%doc doc/libidn.html examples %{_libdir}/libidn.so %{_libdir}/libidn.a %{_includedir}/*.h @@ -94,6 +94,9 @@ rm -rf %{buildroot} %{_mandir}/man3/* %changelog +* Tue Aug 21 2007 Joe Orton 0.6.14-4 +- drop contrib directory from docs + * Mon Aug 20 2007 Joe Orton 0.6.14-3 - fix License From 5e230b53ea8548dfb5b41f97e45bc78a4c1e7e25 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Mon, 15 Oct 2007 19:01:48 +0000 Subject: [PATCH 046/157] makefile update to properly grab makefile.common --- Makefile | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index f6e1efd..48ec762 100644 --- a/Makefile +++ b/Makefile @@ -4,4 +4,19 @@ NAME := libidn SPECFILE = $(firstword $(wildcard *.spec)) UPSTREAM_CHECKS = sig -include ../common/Makefile.common +define find-makefile-common +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +endef + +MAKEFILE_COMMON := $(shell $(find-makefile-common)) + +ifeq ($(MAKEFILE_COMMON),) +# attempt a checkout +define checkout-makefile-common +test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 +endef + +MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) +endif + +include $(MAKEFILE_COMMON) From b6c2470677374895218458d7d717a3fb0df654de Mon Sep 17 00:00:00 2001 From: jorton Date: Thu, 7 Feb 2008 15:17:47 +0000 Subject: [PATCH 047/157] - fix DT_RPATH in /usr/bin/idn - convert libidn.iconv to UTF-8 (Jon Ciesla, #226029) --- libidn.spec | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/libidn.spec b/libidn.spec index a8d924f..114bc74 100644 --- a/libidn.spec +++ b/libidn.spec @@ -1,13 +1,13 @@ Summary: Internationalized Domain Name support library Name: libidn Version: 0.6.14 -Release: 4 -URL: http://www.gnu.org/software/libidn +Release: 5 +URL: http://www.gnu.org/software/libidn/ License: LGPLv2+ Source0: http://josefsson.org/libidn/releases/libidn-%{version}.tar.gz Group: System Environment/Libraries BuildRoot: %{_tmppath}/%{name}-%{version}-root -BuildRequires: pkgconfig, gettext +BuildRequires: pkgconfig, gettext, libtool, autoconf Requires(post): /sbin/install-info Requires(preun): /sbin/install-info Requires(postun): /sbin/ldconfig @@ -35,7 +35,12 @@ developing programs which use the GNU libidn library. # Name directory sections consistently in the info file, #209491 sed -i '/^INFO-DIR-SECTION/{s/GNU Libraries/Libraries/;s/GNU utilities/Utilities/;}' doc/libidn.info +iconv -f ISO-8859-1 -t UTF-8 doc/libidn.info > iconv.tmp +mv iconv.tmp doc/libidn.info + %build +# Must re-bootstrap to get multilib-aware libtool +autoreconf %configure --disable-csharp make %{?_smp_mflags} @@ -44,7 +49,7 @@ make %{?_smp_mflags} -C tests check %install rm -rf %{buildroot} -%makeinstall +make install DESTDIR=$RPM_BUILD_ROOT # provide more examples make %{?_smp_mflags} -C examples distclean @@ -94,6 +99,10 @@ rm -rf %{buildroot} %{_mandir}/man3/* %changelog +* Thu Feb 7 2008 Joe Orton 0.6.14-5 +- fix DT_RPATH in /usr/bin/idn +- convert libidn.iconv to UTF-8 (Jon Ciesla, #226029) + * Tue Aug 21 2007 Joe Orton 0.6.14-4 - drop contrib directory from docs From 3af20acb0faa9aa5c54192b767177289cfbebe96 Mon Sep 17 00:00:00 2001 From: jorton Date: Thu, 7 Feb 2008 15:19:20 +0000 Subject: [PATCH 048/157] - fix BuildRoot tag (Jon Ciesla, #226029) --- libidn.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libidn.spec b/libidn.spec index 114bc74..c51bfd4 100644 --- a/libidn.spec +++ b/libidn.spec @@ -6,7 +6,7 @@ URL: http://www.gnu.org/software/libidn/ License: LGPLv2+ Source0: http://josefsson.org/libidn/releases/libidn-%{version}.tar.gz Group: System Environment/Libraries -BuildRoot: %{_tmppath}/%{name}-%{version}-root +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: pkgconfig, gettext, libtool, autoconf Requires(post): /sbin/install-info Requires(preun): /sbin/install-info @@ -102,6 +102,7 @@ rm -rf %{buildroot} * Thu Feb 7 2008 Joe Orton 0.6.14-5 - fix DT_RPATH in /usr/bin/idn - convert libidn.iconv to UTF-8 (Jon Ciesla, #226029) +- fix BuildRoot tag (Jon Ciesla, #226029) * Tue Aug 21 2007 Joe Orton 0.6.14-4 - drop contrib directory from docs From 0c0435356d6f7deb07408ed35be9c9831008fdfc Mon Sep 17 00:00:00 2001 From: jorton Date: Fri, 7 Mar 2008 15:21:05 +0000 Subject: [PATCH 049/157] - drop libidn.a - move shared library to /lib{,64} (#283651) --- libidn.spec | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/libidn.spec b/libidn.spec index c51bfd4..a6cc5b0 100644 --- a/libidn.spec +++ b/libidn.spec @@ -1,7 +1,7 @@ Summary: Internationalized Domain Name support library Name: libidn Version: 0.6.14 -Release: 5 +Release: 6 URL: http://www.gnu.org/software/libidn/ License: LGPLv2+ Source0: http://josefsson.org/libidn/releases/libidn-%{version}.tar.gz @@ -41,7 +41,7 @@ mv iconv.tmp doc/libidn.info %build # Must re-bootstrap to get multilib-aware libtool autoreconf -%configure --disable-csharp +%configure --disable-csharp --disable-static --libdir=/%{_lib} make %{?_smp_mflags} %check @@ -49,7 +49,7 @@ make %{?_smp_mflags} -C tests check %install rm -rf %{buildroot} -make install DESTDIR=$RPM_BUILD_ROOT +make install DESTDIR=$RPM_BUILD_ROOT pkgconfigdir=%{_libdir}/pkgconfig # provide more examples make %{?_smp_mflags} -C examples distclean @@ -61,9 +61,15 @@ rm -rf $RPM_BUILD_ROOT%{_datadir}/info/dir # Make multilib safe: sed -i '/gnu compiler/d' $RPM_BUILD_ROOT%{_includedir}/idn-int.h -rm -f $RPM_BUILD_ROOT%{_libdir}/*.la \ +rm -f $RPM_BUILD_ROOT/%{_lib}/*.la \ $RPM_BUILD_ROOT%{_datadir}/info/*.png +mkdir -p $RPM_BUILD_ROOT%{_libdir} +mv $RPM_BUILD_ROOT/%{_lib}/libidn.so $RPM_BUILD_ROOT%{_libdir} + +lib=`echo $RPM_BUILD_ROOT/%{_lib}/libidn.so.*.*` +ln -sf ../../%{_lib}/`basename ${lib}` $RPM_BUILD_ROOT%{_libdir}/libidn.so + %find_lang %{name} %post @@ -86,19 +92,22 @@ rm -rf %{buildroot} %{_bindir}/idn %{_mandir}/man1/idn.1* %{_datadir}/emacs/site-lisp -%{_libdir}/libidn.so.* +/%{_lib}/libidn.so.* %{_infodir}/%{name}.info.gz %files devel %defattr(0644,root,root,755) %doc doc/libidn.html examples %{_libdir}/libidn.so -%{_libdir}/libidn.a %{_includedir}/*.h %{_libdir}/pkgconfig/*.pc %{_mandir}/man3/* %changelog +* Fri Mar 7 2008 Joe Orton 0.6.14-6 +- drop libidn.a +- move shared library to /lib{,64} (#283651) + * Thu Feb 7 2008 Joe Orton 0.6.14-5 - fix DT_RPATH in /usr/bin/idn - convert libidn.iconv to UTF-8 (Jon Ciesla, #226029) From 06a36ab9f1a91d5eb351d8255cce11b238e55e4c Mon Sep 17 00:00:00 2001 From: jorton Date: Mon, 31 Mar 2008 10:16:57 +0000 Subject: [PATCH 050/157] - fix libidn.pc for correct libdir (#439549) --- libidn.spec | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/libidn.spec b/libidn.spec index a6cc5b0..0a3b543 100644 --- a/libidn.spec +++ b/libidn.spec @@ -1,7 +1,7 @@ Summary: Internationalized Domain Name support library Name: libidn Version: 0.6.14 -Release: 6 +Release: 7 URL: http://www.gnu.org/software/libidn/ License: LGPLv2+ Source0: http://josefsson.org/libidn/releases/libidn-%{version}.tar.gz @@ -70,6 +70,10 @@ mv $RPM_BUILD_ROOT/%{_lib}/libidn.so $RPM_BUILD_ROOT%{_libdir} lib=`echo $RPM_BUILD_ROOT/%{_lib}/libidn.so.*.*` ln -sf ../../%{_lib}/`basename ${lib}` $RPM_BUILD_ROOT%{_libdir}/libidn.so +# Fix the .pc file to reference the directory which contains the .so +sed -i 's,^libdir=.*$,libdir=%{_libdir},' \ + $RPM_BUILD_ROOT%{_libdir}/pkgconfig/libidn.pc + %find_lang %{name} %post @@ -104,6 +108,9 @@ rm -rf %{buildroot} %{_mandir}/man3/* %changelog +* Mon Mar 31 2008 Joe Orton 0.6.14-7 +- fix libidn.pc for correct libdir (#439549) + * Fri Mar 7 2008 Joe Orton 0.6.14-6 - drop libidn.a - move shared library to /lib{,64} (#283651) From 09160e91d192c43f1ae923f9a04a6c8d324ab58f Mon Sep 17 00:00:00 2001 From: jorton Date: Tue, 10 Jun 2008 15:43:01 +0000 Subject: [PATCH 051/157] - fix build with latest autoconf (#449440) --- libidn-0.6.14-aconf262.patch | 18 ++++++++++++++++++ libidn.spec | 7 ++++++- 2 files changed, 24 insertions(+), 1 deletion(-) create mode 100644 libidn-0.6.14-aconf262.patch diff --git a/libidn-0.6.14-aconf262.patch b/libidn-0.6.14-aconf262.patch new file mode 100644 index 0000000..766c129 --- /dev/null +++ b/libidn-0.6.14-aconf262.patch @@ -0,0 +1,18 @@ +--- libidn-0.6.14/lib/gl/m4/extensions.m4.aconf262 ++++ libidn-0.6.14/lib/gl/m4/extensions.m4 +@@ -16,6 +16,7 @@ + # ------------------------ + # Enable extensions on systems that normally disable them, + # typically due to standards-conformance issues. ++m4_ifndef([AC_USE_SYSTEM_EXTENSIONS], [ + AC_DEFUN([AC_USE_SYSTEM_EXTENSIONS], + [ + AC_BEFORE([$0], [AC_COMPILE_IFELSE]) +@@ -49,6 +50,7 @@ AC_DEFUN([AC_USE_SYSTEM_EXTENSIONS], + AC_DEFINE([_POSIX_PTHREAD_SEMANTICS]) + AC_DEFINE([_TANDEM_SOURCE]) + ]) ++]) + + # gl_USE_SYSTEM_EXTENSIONS + # ------------------------ diff --git a/libidn.spec b/libidn.spec index 0a3b543..b9b266e 100644 --- a/libidn.spec +++ b/libidn.spec @@ -1,10 +1,11 @@ Summary: Internationalized Domain Name support library Name: libidn Version: 0.6.14 -Release: 7 +Release: 8 URL: http://www.gnu.org/software/libidn/ License: LGPLv2+ Source0: http://josefsson.org/libidn/releases/libidn-%{version}.tar.gz +Patch0: libidn-0.6.14-aconf262.patch Group: System Environment/Libraries BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: pkgconfig, gettext, libtool, autoconf @@ -31,6 +32,7 @@ developing programs which use the GNU libidn library. %prep %setup -q +%patch0 -p1 -b .aconf262 # Name directory sections consistently in the info file, #209491 sed -i '/^INFO-DIR-SECTION/{s/GNU Libraries/Libraries/;s/GNU utilities/Utilities/;}' doc/libidn.info @@ -108,6 +110,9 @@ rm -rf %{buildroot} %{_mandir}/man3/* %changelog +* Tue Jun 10 2008 Joe Orton 0.6.14-8 +- fix build with latest autoconf (#449440) + * Mon Mar 31 2008 Joe Orton 0.6.14-7 - fix libidn.pc for correct libdir (#439549) From 19af422163d566b45b0b7405238348b65212273b Mon Sep 17 00:00:00 2001 From: jorton Date: Fri, 2 Jan 2009 14:16:39 +0000 Subject: [PATCH 052/157] - fix the problem with #include_next --- libidn-0.6.14-include-next.patch | 12 ++++++++++++ libidn.spec | 11 +++++++++-- 2 files changed, 21 insertions(+), 2 deletions(-) create mode 100644 libidn-0.6.14-include-next.patch diff --git a/libidn-0.6.14-include-next.patch b/libidn-0.6.14-include-next.patch new file mode 100644 index 0000000..d28ea9d --- /dev/null +++ b/libidn-0.6.14-include-next.patch @@ -0,0 +1,12 @@ +diff -urp libidn-0.6.14.orig/lib/Makefile.am libidn-0.6.14/lib/Makefile.am +--- libidn-0.6.14.orig/lib/Makefile.am 2007-05-31 06:31:00.000000000 -0400 ++++ libidn-0.6.14/lib/Makefile.am 2008-12-16 00:25:12.000000000 -0500 +@@ -37,7 +37,7 @@ nodist_include_HEADERS = $(idn_int) + + idn-int.h: + if test -n "$(STDINT_H)"; then \ +- cp gl/stdint.h idn-int.h; \ ++ sed -e s/include_next/include/ gl/stdint.h > idn-int.h; \ + else \ + echo '#include ' > idn-int.h; \ + fi diff --git a/libidn.spec b/libidn.spec index b9b266e..80640b9 100644 --- a/libidn.spec +++ b/libidn.spec @@ -1,11 +1,12 @@ Summary: Internationalized Domain Name support library Name: libidn Version: 0.6.14 -Release: 8 +Release: 9 URL: http://www.gnu.org/software/libidn/ License: LGPLv2+ Source0: http://josefsson.org/libidn/releases/libidn-%{version}.tar.gz Patch0: libidn-0.6.14-aconf262.patch +Patch1: libidn-0.6.14-include-next.patch Group: System Environment/Libraries BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: pkgconfig, gettext, libtool, autoconf @@ -33,6 +34,7 @@ developing programs which use the GNU libidn library. %prep %setup -q %patch0 -p1 -b .aconf262 +%patch1 -p1 -b .include-next-fix # Name directory sections consistently in the info file, #209491 sed -i '/^INFO-DIR-SECTION/{s/GNU Libraries/Libraries/;s/GNU utilities/Utilities/;}' doc/libidn.info @@ -42,7 +44,9 @@ mv iconv.tmp doc/libidn.info %build # Must re-bootstrap to get multilib-aware libtool -autoreconf +libtoolize --force --copy +aclocal -I m4 -I gl/m4 -I lib/gl/m4 +autoheader && autoconf && automake %configure --disable-csharp --disable-static --libdir=/%{_lib} make %{?_smp_mflags} @@ -110,6 +114,9 @@ rm -rf %{buildroot} %{_mandir}/man3/* %changelog +* Mon Dec 29 2008 Kedar Sovani 0.6.14-9 +- fix the problem with #include_next + * Tue Jun 10 2008 Joe Orton 0.6.14-8 - fix build with latest autoconf (#449440) From a63f624649a855a008ff8fcdc1d0a7a1d6cb3801 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Wed, 25 Feb 2009 15:49:29 +0000 Subject: [PATCH 053/157] - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild --- libidn.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libidn.spec b/libidn.spec index 80640b9..c806311 100644 --- a/libidn.spec +++ b/libidn.spec @@ -1,7 +1,7 @@ Summary: Internationalized Domain Name support library Name: libidn Version: 0.6.14 -Release: 9 +Release: 10 URL: http://www.gnu.org/software/libidn/ License: LGPLv2+ Source0: http://josefsson.org/libidn/releases/libidn-%{version}.tar.gz @@ -114,6 +114,9 @@ rm -rf %{buildroot} %{_mandir}/man3/* %changelog +* Wed Feb 25 2009 Fedora Release Engineering - 0.6.14-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + * Mon Dec 29 2008 Kedar Sovani 0.6.14-9 - fix the problem with #include_next From 5a944c302009841769fb71a9f04fbc9dbb2b2578 Mon Sep 17 00:00:00 2001 From: jorton Date: Tue, 10 Mar 2009 08:41:11 +0000 Subject: [PATCH 054/157] - update to 1.9 (#302111) - update License to reflect GPLv3+ binaries, LGPLv2+ library --- .cvsignore | 5 +---- libidn-0.6.14-aconf262.patch | 18 ------------------ libidn-0.6.14-include-next.patch | 12 ------------ libidn-1.9.tar.gz.sig | 10 ++++++++++ libidn.spec | 18 ++++++++---------- mirrors | 2 +- sources | 2 +- upstream | 2 +- 8 files changed, 22 insertions(+), 47 deletions(-) delete mode 100644 libidn-0.6.14-aconf262.patch delete mode 100644 libidn-0.6.14-include-next.patch create mode 100644 libidn-1.9.tar.gz.sig diff --git a/.cvsignore b/.cvsignore index 75a56d3..5cb2153 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,4 +1 @@ -libidn-0.6.14.tar.gz -libidn-0.6.14 -x86_64 -clog +libidn-1.9.tar.gz diff --git a/libidn-0.6.14-aconf262.patch b/libidn-0.6.14-aconf262.patch deleted file mode 100644 index 766c129..0000000 --- a/libidn-0.6.14-aconf262.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- libidn-0.6.14/lib/gl/m4/extensions.m4.aconf262 -+++ libidn-0.6.14/lib/gl/m4/extensions.m4 -@@ -16,6 +16,7 @@ - # ------------------------ - # Enable extensions on systems that normally disable them, - # typically due to standards-conformance issues. -+m4_ifndef([AC_USE_SYSTEM_EXTENSIONS], [ - AC_DEFUN([AC_USE_SYSTEM_EXTENSIONS], - [ - AC_BEFORE([$0], [AC_COMPILE_IFELSE]) -@@ -49,6 +50,7 @@ AC_DEFUN([AC_USE_SYSTEM_EXTENSIONS], - AC_DEFINE([_POSIX_PTHREAD_SEMANTICS]) - AC_DEFINE([_TANDEM_SOURCE]) - ]) -+]) - - # gl_USE_SYSTEM_EXTENSIONS - # ------------------------ diff --git a/libidn-0.6.14-include-next.patch b/libidn-0.6.14-include-next.patch deleted file mode 100644 index d28ea9d..0000000 --- a/libidn-0.6.14-include-next.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -urp libidn-0.6.14.orig/lib/Makefile.am libidn-0.6.14/lib/Makefile.am ---- libidn-0.6.14.orig/lib/Makefile.am 2007-05-31 06:31:00.000000000 -0400 -+++ libidn-0.6.14/lib/Makefile.am 2008-12-16 00:25:12.000000000 -0500 -@@ -37,7 +37,7 @@ nodist_include_HEADERS = $(idn_int) - - idn-int.h: - if test -n "$(STDINT_H)"; then \ -- cp gl/stdint.h idn-int.h; \ -+ sed -e s/include_next/include/ gl/stdint.h > idn-int.h; \ - else \ - echo '#include ' > idn-int.h; \ - fi diff --git a/libidn-1.9.tar.gz.sig b/libidn-1.9.tar.gz.sig new file mode 100644 index 0000000..f1f914a --- /dev/null +++ b/libidn-1.9.tar.gz.sig @@ -0,0 +1,10 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.6 (GNU/Linux) + +iOoEAAECADQFAkhqWXotFIAAAAAAFQAPcGthLWFkZHJlc3NAZ251cGcub3JnamFz +QGV4dHVuZG8uY29tAAoJEO2iHpS1ZXFvjn8E/iCct48j/lxCfxz7VCCHH/zad/EA +3bfxHbo8zO7I3pdk4a/Q7pOM5mXWqmf87YVfkx513WMNKs+4QjnzM9bhUUeayMEm +njEFVGN3b6qMpVQxco58ztHZOsfdu9SfZ81qyM1234CXVzEkbsJe065xqCoRmX1Y +SZbNKWfHme6prO9nkAPQ2YLRXFPfkklB0dR4GxVcsUJ0Pp0hoyobb6i+ouU= +=ABeW +-----END PGP SIGNATURE----- diff --git a/libidn.spec b/libidn.spec index c806311..4e89ef0 100644 --- a/libidn.spec +++ b/libidn.spec @@ -1,12 +1,10 @@ Summary: Internationalized Domain Name support library Name: libidn -Version: 0.6.14 -Release: 10 +Version: 1.9 +Release: 1 URL: http://www.gnu.org/software/libidn/ -License: LGPLv2+ +License: LGPLv2+ and GPLv3+ Source0: http://josefsson.org/libidn/releases/libidn-%{version}.tar.gz -Patch0: libidn-0.6.14-aconf262.patch -Patch1: libidn-0.6.14-include-next.patch Group: System Environment/Libraries BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: pkgconfig, gettext, libtool, autoconf @@ -33,8 +31,6 @@ developing programs which use the GNU libidn library. %prep %setup -q -%patch0 -p1 -b .aconf262 -%patch1 -p1 -b .include-next-fix # Name directory sections consistently in the info file, #209491 sed -i '/^INFO-DIR-SECTION/{s/GNU Libraries/Libraries/;s/GNU utilities/Utilities/;}' doc/libidn.info @@ -44,9 +40,7 @@ mv iconv.tmp doc/libidn.info %build # Must re-bootstrap to get multilib-aware libtool -libtoolize --force --copy -aclocal -I m4 -I gl/m4 -I lib/gl/m4 -autoheader && autoconf && automake +autoreconf %configure --disable-csharp --disable-static --libdir=/%{_lib} make %{?_smp_mflags} @@ -114,6 +108,10 @@ rm -rf %{buildroot} %{_mandir}/man3/* %changelog +* Tue Mar 10 2009 Joe Orton 1.9-1 +- update to 1.9 (#302111) +- update License to reflect GPLv3+ binaries, LGPLv2+ library + * Wed Feb 25 2009 Fedora Release Engineering - 0.6.14-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild diff --git a/mirrors b/mirrors index 583b40f..c233239 100644 --- a/mirrors +++ b/mirrors @@ -1 +1 @@ -http://josefsson.org/libidn/releases/ +http://ftp.gnu.org/gnu/libidn/ diff --git a/sources b/sources index 08cf30c..a67a56a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -040f012a45feb56168853998bb87ad4d libidn-0.6.14.tar.gz +f4d794639564256a367566302611224e libidn-1.9.tar.gz diff --git a/upstream b/upstream index 2e2fd4d..5cb2153 100644 --- a/upstream +++ b/upstream @@ -1 +1 @@ -libidn-0.6.14.tar.gz +libidn-1.9.tar.gz From 5ef2987860858ef549661e6410473a02ecf6b3b0 Mon Sep 17 00:00:00 2001 From: jorton Date: Tue, 10 Mar 2009 08:44:02 +0000 Subject: [PATCH 055/157] - remove old sig file --- libidn-0.6.14.tar.gz.sig | 10 ---------- 1 file changed, 10 deletions(-) delete mode 100644 libidn-0.6.14.tar.gz.sig diff --git a/libidn-0.6.14.tar.gz.sig b/libidn-0.6.14.tar.gz.sig deleted file mode 100644 index cb9c70d..0000000 --- a/libidn-0.6.14.tar.gz.sig +++ /dev/null @@ -1,10 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.6 (GNU/Linux) - -iOoEAAECADQFAkZeqf8tFIAAAAAAFQAPcGthLWFkZHJlc3NAZ251cGcub3JnamFz -QGV4dHVuZG8uY29tAAoJEO2iHpS1ZXFvAPgE/1NO2c/V79+87KlTtXosfPXyU14I -cZ7UA6Boe2kqQXJ0XNW631kJQbBAiTJQmYZXIljDA3ikIq06rtbhh5bLzpMnfKhZ -kYlr7Ja1bzzuQis8AbAbAeZBa0FRCMu8JuN9yC7yANZS3FiMJqcVINKLEv9eRfxX -xiVpYajqEMjDbt4Y0Sl7/KjhLMQmAzI9qd2Kq6MyFyGbVTIhBAs2tFmcZI0= -=Smlw ------END PGP SIGNATURE----- From 9974101bdc15d29b387e0a31bd940e278d463d8c Mon Sep 17 00:00:00 2001 From: jorton Date: Tue, 10 Mar 2009 08:46:49 +0000 Subject: [PATCH 056/157] bump release --- libidn.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libidn.spec b/libidn.spec index 4e89ef0..f13d6ed 100644 --- a/libidn.spec +++ b/libidn.spec @@ -1,7 +1,7 @@ Summary: Internationalized Domain Name support library Name: libidn Version: 1.9 -Release: 1 +Release: 2 URL: http://www.gnu.org/software/libidn/ License: LGPLv2+ and GPLv3+ Source0: http://josefsson.org/libidn/releases/libidn-%{version}.tar.gz @@ -108,7 +108,7 @@ rm -rf %{buildroot} %{_mandir}/man3/* %changelog -* Tue Mar 10 2009 Joe Orton 1.9-1 +* Tue Mar 10 2009 Joe Orton 1.9-2 - update to 1.9 (#302111) - update License to reflect GPLv3+ binaries, LGPLv2+ library From 4ebea68cb6983c34b8ad45fc50e9f4eb771d4eda Mon Sep 17 00:00:00 2001 From: jorton Date: Tue, 10 Mar 2009 08:58:24 +0000 Subject: [PATCH 057/157] - autoreconf fix --- libidn.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libidn.spec b/libidn.spec index f13d6ed..e8fcdc8 100644 --- a/libidn.spec +++ b/libidn.spec @@ -1,7 +1,7 @@ Summary: Internationalized Domain Name support library Name: libidn Version: 1.9 -Release: 2 +Release: 3 URL: http://www.gnu.org/software/libidn/ License: LGPLv2+ and GPLv3+ Source0: http://josefsson.org/libidn/releases/libidn-%{version}.tar.gz @@ -40,7 +40,7 @@ mv iconv.tmp doc/libidn.info %build # Must re-bootstrap to get multilib-aware libtool -autoreconf +autoreconf -i %configure --disable-csharp --disable-static --libdir=/%{_lib} make %{?_smp_mflags} From 7ef5e7aac7ae74fd16f67112ec0e80146c53da27 Mon Sep 17 00:00:00 2001 From: jorton Date: Tue, 10 Mar 2009 09:10:52 +0000 Subject: [PATCH 058/157] - drop ChangeLog from %doc - drop autoreconf entirely --- libidn.spec | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/libidn.spec b/libidn.spec index e8fcdc8..4d682a9 100644 --- a/libidn.spec +++ b/libidn.spec @@ -1,13 +1,13 @@ Summary: Internationalized Domain Name support library Name: libidn Version: 1.9 -Release: 3 +Release: 4 URL: http://www.gnu.org/software/libidn/ License: LGPLv2+ and GPLv3+ Source0: http://josefsson.org/libidn/releases/libidn-%{version}.tar.gz Group: System Environment/Libraries BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: pkgconfig, gettext, libtool, autoconf +BuildRequires: pkgconfig, gettext Requires(post): /sbin/install-info Requires(preun): /sbin/install-info Requires(postun): /sbin/ldconfig @@ -39,8 +39,6 @@ iconv -f ISO-8859-1 -t UTF-8 doc/libidn.info > iconv.tmp mv iconv.tmp doc/libidn.info %build -# Must re-bootstrap to get multilib-aware libtool -autoreconf -i %configure --disable-csharp --disable-static --libdir=/%{_lib} make %{?_smp_mflags} @@ -92,7 +90,7 @@ rm -rf %{buildroot} %files -f %{name}.lang %defattr(-,root,root) -%doc ChangeLog NEWS FAQ README THANKS COPYING* +%doc AUTHORS NEWS FAQ README THANKS COPYING* %{_bindir}/idn %{_mandir}/man1/idn.1* %{_datadir}/emacs/site-lisp @@ -108,7 +106,7 @@ rm -rf %{buildroot} %{_mandir}/man3/* %changelog -* Tue Mar 10 2009 Joe Orton 1.9-2 +* Tue Mar 10 2009 Joe Orton 1.9-4 - update to 1.9 (#302111) - update License to reflect GPLv3+ binaries, LGPLv2+ library From 079c9abc8b01a2cd07ed3d80fc843eab6ec4b9cc Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Sat, 25 Jul 2009 05:57:07 +0000 Subject: [PATCH 059/157] - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild --- libidn.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libidn.spec b/libidn.spec index 4d682a9..f460fff 100644 --- a/libidn.spec +++ b/libidn.spec @@ -1,7 +1,7 @@ Summary: Internationalized Domain Name support library Name: libidn Version: 1.9 -Release: 4 +Release: 5 URL: http://www.gnu.org/software/libidn/ License: LGPLv2+ and GPLv3+ Source0: http://josefsson.org/libidn/releases/libidn-%{version}.tar.gz @@ -106,6 +106,9 @@ rm -rf %{buildroot} %{_mandir}/man3/* %changelog +* Fri Jul 24 2009 Fedora Release Engineering - 1.9-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + * Tue Mar 10 2009 Joe Orton 1.9-4 - update to 1.9 (#302111) - update License to reflect GPLv3+ binaries, LGPLv2+ library From 37c9f73267b1f728e9f7bfda8dfb747e4d8b65ba Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Wed, 25 Nov 2009 23:51:01 +0000 Subject: [PATCH 060/157] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 48ec762..e0ae6a3 100644 --- a/Makefile +++ b/Makefile @@ -5,7 +5,7 @@ SPECFILE = $(firstword $(wildcard *.spec)) UPSTREAM_CHECKS = sig define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From d2b78ad30e3931ffc8bd1872297b8cfdae3c66df Mon Sep 17 00:00:00 2001 From: jorton Date: Fri, 29 Jan 2010 16:02:22 +0000 Subject: [PATCH 061/157] - update to 1.16 --- .cvsignore | 2 +- libidn-1.16.tar.gz.sig | 10 ++++++++++ libidn-1.9.tar.gz.sig | 10 ---------- libidn.spec | 7 +++++-- sources | 2 +- upstream | 2 +- 6 files changed, 18 insertions(+), 15 deletions(-) create mode 100644 libidn-1.16.tar.gz.sig delete mode 100644 libidn-1.9.tar.gz.sig diff --git a/.cvsignore b/.cvsignore index 5cb2153..bcd1b91 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -libidn-1.9.tar.gz +libidn-1.16.tar.gz diff --git a/libidn-1.16.tar.gz.sig b/libidn-1.16.tar.gz.sig new file mode 100644 index 0000000..fba727e --- /dev/null +++ b/libidn-1.16.tar.gz.sig @@ -0,0 +1,10 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.10 (GNU/Linux) + +iOoEAAECADQFAktMX6stFIAAAAAAFQAPcGthLWFkZHJlc3NAZ251cGcub3JnamFz +QGV4dHVuZG8uY29tAAoJEO2iHpS1ZXFvjNcE/i0ZcqKcbDIQ3T81x48yPyOl9yL1 +cnOodCLJZdTMVbkscLYemsI9X+541dTc/aXfsa2sTlQHnsm+5bPKFtQumsIcldeR +gaY3O1SkM1lwcIRzpMOxEpKRNWj3/Ge5J7WWcjjKnGtAWFWjZcuW5jMfZlbrCBNb +OJiD+PPecY2kdFxpviUtH1iavwQRfXDD0G9Spt/S9PV3KWGvNwd5EoRc5Zc= +=CeBB +-----END PGP SIGNATURE----- diff --git a/libidn-1.9.tar.gz.sig b/libidn-1.9.tar.gz.sig deleted file mode 100644 index f1f914a..0000000 --- a/libidn-1.9.tar.gz.sig +++ /dev/null @@ -1,10 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.6 (GNU/Linux) - -iOoEAAECADQFAkhqWXotFIAAAAAAFQAPcGthLWFkZHJlc3NAZ251cGcub3JnamFz -QGV4dHVuZG8uY29tAAoJEO2iHpS1ZXFvjn8E/iCct48j/lxCfxz7VCCHH/zad/EA -3bfxHbo8zO7I3pdk4a/Q7pOM5mXWqmf87YVfkx513WMNKs+4QjnzM9bhUUeayMEm -njEFVGN3b6qMpVQxco58ztHZOsfdu9SfZ81qyM1234CXVzEkbsJe065xqCoRmX1Y -SZbNKWfHme6prO9nkAPQ2YLRXFPfkklB0dR4GxVcsUJ0Pp0hoyobb6i+ouU= -=ABeW ------END PGP SIGNATURE----- diff --git a/libidn.spec b/libidn.spec index f460fff..294056d 100644 --- a/libidn.spec +++ b/libidn.spec @@ -1,7 +1,7 @@ Summary: Internationalized Domain Name support library Name: libidn -Version: 1.9 -Release: 5 +Version: 1.16 +Release: 1%{?dist} URL: http://www.gnu.org/software/libidn/ License: LGPLv2+ and GPLv3+ Source0: http://josefsson.org/libidn/releases/libidn-%{version}.tar.gz @@ -106,6 +106,9 @@ rm -rf %{buildroot} %{_mandir}/man3/* %changelog +* Fri Jan 29 2010 Joe Orton - 1.16-1 +- update to 1.16 + * Fri Jul 24 2009 Fedora Release Engineering - 1.9-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild diff --git a/sources b/sources index a67a56a..f30879b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -f4d794639564256a367566302611224e libidn-1.9.tar.gz +a6af62602fa71bc1b90ce246dd208bd6 libidn-1.16.tar.gz diff --git a/upstream b/upstream index 5cb2153..bcd1b91 100644 --- a/upstream +++ b/upstream @@ -1 +1 @@ -libidn-1.9.tar.gz +libidn-1.16.tar.gz From cc2fe68369e20daa13ee9d81e23c5439e05cade0 Mon Sep 17 00:00:00 2001 From: jorton Date: Mon, 29 Mar 2010 08:35:19 +0000 Subject: [PATCH 062/157] - update to 1.18 - fix Source0 to reference gnu.org repository --- .cvsignore | 2 +- libidn-1.18.tar.gz.sig | 10 ++++++++++ libidn.spec | 8 ++++++-- sources | 2 +- upstream | 2 +- 5 files changed, 19 insertions(+), 5 deletions(-) create mode 100644 libidn-1.18.tar.gz.sig diff --git a/.cvsignore b/.cvsignore index bcd1b91..59ac15a 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -libidn-1.16.tar.gz +libidn-1.18.tar.gz diff --git a/libidn-1.18.tar.gz.sig b/libidn-1.18.tar.gz.sig new file mode 100644 index 0000000..bc4eb73 --- /dev/null +++ b/libidn-1.18.tar.gz.sig @@ -0,0 +1,10 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.10 (GNU/Linux) + +iOoEAAECADQFAkt5PIItFIAAAAAAFQAPcGthLWFkZHJlc3NAZ251cGcub3JnamFz +QGV4dHVuZG8uY29tAAoJEO2iHpS1ZXFviREFAJwDtU3ju/6W+lCX0i87K6SAzK9z +PiixoOvqe3rvdsK5CI1BoHv5bB0TejgvzNUdUJMHcbwI374fOQ9OBPXLDgkwFb4j +839bRUH4QIoAN0hPJfCFKK6LTzHBEf8iUtepSNG3zFlA7MSm2nKYxu3DzzZQx4q7 ++gjrPwAtQ62O4eVgWTeUSShds+gDKEkTGvWf3erY48OLx6gfAzKEFonkavM= +=vXpU +-----END PGP SIGNATURE----- diff --git a/libidn.spec b/libidn.spec index 294056d..647f3de 100644 --- a/libidn.spec +++ b/libidn.spec @@ -1,10 +1,10 @@ Summary: Internationalized Domain Name support library Name: libidn -Version: 1.16 +Version: 1.18 Release: 1%{?dist} URL: http://www.gnu.org/software/libidn/ License: LGPLv2+ and GPLv3+ -Source0: http://josefsson.org/libidn/releases/libidn-%{version}.tar.gz +Source0: http://ftp.gnu.org/gnu/libidn/libidn-%{version}.tar.gz Group: System Environment/Libraries BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: pkgconfig, gettext @@ -106,6 +106,10 @@ rm -rf %{buildroot} %{_mandir}/man3/* %changelog +* Mon Mar 29 2010 Joe Orton - 1.18-1 +- update to 1.18 +- fix Source0 to reference gnu.org repository + * Fri Jan 29 2010 Joe Orton - 1.16-1 - update to 1.16 diff --git a/sources b/sources index f30879b..ef5d99e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a6af62602fa71bc1b90ce246dd208bd6 libidn-1.16.tar.gz +66f115347439f56386f37a3ad92c1da2 libidn-1.18.tar.gz diff --git a/upstream b/upstream index bcd1b91..59ac15a 100644 --- a/upstream +++ b/upstream @@ -1 +1 @@ -libidn-1.16.tar.gz +libidn-1.18.tar.gz From 5e58ca10b753cf658131ac23b062c042367eb573 Mon Sep 17 00:00:00 2001 From: jorton Date: Tue, 30 Mar 2010 21:34:41 +0000 Subject: [PATCH 063/157] - add GFDL to License --- libidn-1.16.tar.gz.sig | 10 ---------- libidn.spec | 7 +++++-- 2 files changed, 5 insertions(+), 12 deletions(-) delete mode 100644 libidn-1.16.tar.gz.sig diff --git a/libidn-1.16.tar.gz.sig b/libidn-1.16.tar.gz.sig deleted file mode 100644 index fba727e..0000000 --- a/libidn-1.16.tar.gz.sig +++ /dev/null @@ -1,10 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.10 (GNU/Linux) - -iOoEAAECADQFAktMX6stFIAAAAAAFQAPcGthLWFkZHJlc3NAZ251cGcub3JnamFz -QGV4dHVuZG8uY29tAAoJEO2iHpS1ZXFvjNcE/i0ZcqKcbDIQ3T81x48yPyOl9yL1 -cnOodCLJZdTMVbkscLYemsI9X+541dTc/aXfsa2sTlQHnsm+5bPKFtQumsIcldeR -gaY3O1SkM1lwcIRzpMOxEpKRNWj3/Ge5J7WWcjjKnGtAWFWjZcuW5jMfZlbrCBNb -OJiD+PPecY2kdFxpviUtH1iavwQRfXDD0G9Spt/S9PV3KWGvNwd5EoRc5Zc= -=CeBB ------END PGP SIGNATURE----- diff --git a/libidn.spec b/libidn.spec index 647f3de..bab5b9d 100644 --- a/libidn.spec +++ b/libidn.spec @@ -1,9 +1,9 @@ Summary: Internationalized Domain Name support library Name: libidn Version: 1.18 -Release: 1%{?dist} +Release: 2%{?dist} URL: http://www.gnu.org/software/libidn/ -License: LGPLv2+ and GPLv3+ +License: LGPLv2+ and GPLv3+ and GFDL Source0: http://ftp.gnu.org/gnu/libidn/libidn-%{version}.tar.gz Group: System Environment/Libraries BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -106,6 +106,9 @@ rm -rf %{buildroot} %{_mandir}/man3/* %changelog +* Tue Mar 30 2010 Joe Orton - 1.18-2 +- add GFDL to License + * Mon Mar 29 2010 Joe Orton - 1.18-1 - update to 1.18 - fix Source0 to reference gnu.org repository From 758d36aadeea8674bc78bd1a818460d9e22eb91c Mon Sep 17 00:00:00 2001 From: jorton Date: Mon, 24 May 2010 08:35:34 +0000 Subject: [PATCH 064/157] - update to 1.19 (#595086) --- .cvsignore | 2 +- libidn-1.18.tar.gz.sig | 10 ---------- libidn-1.19.tar.gz.sig | 10 ++++++++++ libidn.spec | 7 +++++-- sources | 2 +- upstream | 2 +- 6 files changed, 18 insertions(+), 15 deletions(-) delete mode 100644 libidn-1.18.tar.gz.sig create mode 100644 libidn-1.19.tar.gz.sig diff --git a/.cvsignore b/.cvsignore index 59ac15a..0cde68b 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -libidn-1.18.tar.gz +libidn-1.19.tar.gz diff --git a/libidn-1.18.tar.gz.sig b/libidn-1.18.tar.gz.sig deleted file mode 100644 index bc4eb73..0000000 --- a/libidn-1.18.tar.gz.sig +++ /dev/null @@ -1,10 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.10 (GNU/Linux) - -iOoEAAECADQFAkt5PIItFIAAAAAAFQAPcGthLWFkZHJlc3NAZ251cGcub3JnamFz -QGV4dHVuZG8uY29tAAoJEO2iHpS1ZXFviREFAJwDtU3ju/6W+lCX0i87K6SAzK9z -PiixoOvqe3rvdsK5CI1BoHv5bB0TejgvzNUdUJMHcbwI374fOQ9OBPXLDgkwFb4j -839bRUH4QIoAN0hPJfCFKK6LTzHBEf8iUtepSNG3zFlA7MSm2nKYxu3DzzZQx4q7 -+gjrPwAtQ62O4eVgWTeUSShds+gDKEkTGvWf3erY48OLx6gfAzKEFonkavM= -=vXpU ------END PGP SIGNATURE----- diff --git a/libidn-1.19.tar.gz.sig b/libidn-1.19.tar.gz.sig new file mode 100644 index 0000000..a3c4c0e --- /dev/null +++ b/libidn-1.19.tar.gz.sig @@ -0,0 +1,10 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.10 (GNU/Linux) + +iOoEAAECADQFAkv3wcEtFIAAAAAAFQAPcGthLWFkZHJlc3NAZ251cGcub3JnamFz +QGV4dHVuZG8uY29tAAoJEO2iHpS1ZXFvYTwFALThMWr9YUKBvWIyAYsuo0nN0ozf +qE/bSAw2+ThQ6RDo25y9FmMSDuzbQV5rM/10QJ0kAWAJ84QPUCkuO+c46960i1bq +oMFbGs9BUrAoYpD0g/5EpTOc+gvx5aNnK59gD451jJqGoyZG32TvB5nDGEarpJwR +SFg4QPPVD661stqOKxSClgdGoxV0BUkd2YnZYECJxge0WOdPLpVZQuwkBtg= +=tpYr +-----END PGP SIGNATURE----- diff --git a/libidn.spec b/libidn.spec index bab5b9d..79ffc85 100644 --- a/libidn.spec +++ b/libidn.spec @@ -1,7 +1,7 @@ Summary: Internationalized Domain Name support library Name: libidn -Version: 1.18 -Release: 2%{?dist} +Version: 1.19 +Release: 1%{?dist} URL: http://www.gnu.org/software/libidn/ License: LGPLv2+ and GPLv3+ and GFDL Source0: http://ftp.gnu.org/gnu/libidn/libidn-%{version}.tar.gz @@ -106,6 +106,9 @@ rm -rf %{buildroot} %{_mandir}/man3/* %changelog +* Mon May 24 2010 Joe Orton - 1.19-1 +- update to 1.19 (#595086) + * Tue Mar 30 2010 Joe Orton - 1.18-2 - add GFDL to License diff --git a/sources b/sources index ef5d99e..27a1b20 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -66f115347439f56386f37a3ad92c1da2 libidn-1.18.tar.gz +a45142126d28162014c995f969bdb5a8 libidn-1.19.tar.gz diff --git a/upstream b/upstream index 59ac15a..0cde68b 100644 --- a/upstream +++ b/upstream @@ -1 +1 @@ -libidn-1.18.tar.gz +libidn-1.19.tar.gz From 252f19a64008965c88bcb085acb9a4d7c277f17b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 21:12:20 +0000 Subject: [PATCH 065/157] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 22 ---------------------- 2 files changed, 22 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index e0ae6a3..0000000 --- a/Makefile +++ /dev/null @@ -1,22 +0,0 @@ -# Makefile for source rpm: libidn -# $Id$ -NAME := libidn -SPECFILE = $(firstword $(wildcard *.spec)) -UPSTREAM_CHECKS = sig - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attempt a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) From d93f5a32756979301e8e746de1beda743f87680b Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 9 Feb 2011 14:37:23 -0600 Subject: [PATCH 066/157] - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild --- libidn.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libidn.spec b/libidn.spec index 79ffc85..ebbc72c 100644 --- a/libidn.spec +++ b/libidn.spec @@ -1,7 +1,7 @@ Summary: Internationalized Domain Name support library Name: libidn Version: 1.19 -Release: 1%{?dist} +Release: 2%{?dist} URL: http://www.gnu.org/software/libidn/ License: LGPLv2+ and GPLv3+ and GFDL Source0: http://ftp.gnu.org/gnu/libidn/libidn-%{version}.tar.gz @@ -106,6 +106,9 @@ rm -rf %{buildroot} %{_mandir}/man3/* %changelog +* Wed Feb 09 2011 Fedora Release Engineering - 1.19-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + * Mon May 24 2010 Joe Orton - 1.19-1 - update to 1.19 (#595086) From 29f00f122f9e55f1bba5bdd6b93be4649d71c304 Mon Sep 17 00:00:00 2001 From: Miroslav Lichvar Date: Thu, 3 Mar 2011 15:06:17 +0100 Subject: [PATCH 067/157] update to 1.20 --- .gitignore | 1 + libidn.spec | 11 +++++++---- sources | 2 +- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 0cde68b..daf67b2 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ libidn-1.19.tar.gz +/libidn-1.20.tar.gz diff --git a/libidn.spec b/libidn.spec index ebbc72c..fb38f81 100644 --- a/libidn.spec +++ b/libidn.spec @@ -1,17 +1,16 @@ Summary: Internationalized Domain Name support library Name: libidn -Version: 1.19 -Release: 2%{?dist} +Version: 1.20 +Release: 1%{?dist} URL: http://www.gnu.org/software/libidn/ License: LGPLv2+ and GPLv3+ and GFDL Source0: http://ftp.gnu.org/gnu/libidn/libidn-%{version}.tar.gz Group: System Environment/Libraries BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: pkgconfig, gettext -Requires(post): /sbin/install-info +Requires(post): /sbin/install-info /sbin/ldconfig Requires(preun): /sbin/install-info Requires(postun): /sbin/ldconfig -Requires(pre): /sbin/ldconfig %description GNU Libidn is an implementation of the Stringprep, Punycode and @@ -106,6 +105,10 @@ rm -rf %{buildroot} %{_mandir}/man3/* %changelog +* Thu Mar 03 2011 Miroslav Lichvar - 1.20-1 +- update to 1.20 +- fix requires + * Wed Feb 09 2011 Fedora Release Engineering - 1.19-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild diff --git a/sources b/sources index 27a1b20..7f74153 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a45142126d28162014c995f969bdb5a8 libidn-1.19.tar.gz +03996d474a696e59fdddbee87fc9519c libidn-1.20.tar.gz From 9026dfeec274ecd8683e6d0097903b00159e3f5e Mon Sep 17 00:00:00 2001 From: Miroslav Lichvar Date: Tue, 26 Apr 2011 09:55:14 +0200 Subject: [PATCH 068/157] update to 1.21 --- .gitignore | 1 + libidn.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index daf67b2..a48cbb1 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ libidn-1.19.tar.gz /libidn-1.20.tar.gz +/libidn-1.21.tar.gz diff --git a/libidn.spec b/libidn.spec index fb38f81..dc3a9f1 100644 --- a/libidn.spec +++ b/libidn.spec @@ -1,6 +1,6 @@ Summary: Internationalized Domain Name support library Name: libidn -Version: 1.20 +Version: 1.21 Release: 1%{?dist} URL: http://www.gnu.org/software/libidn/ License: LGPLv2+ and GPLv3+ and GFDL @@ -105,6 +105,9 @@ rm -rf %{buildroot} %{_mandir}/man3/* %changelog +* Tue Apr 26 2011 Miroslav Lichvar - 1.21-1 +- update to 1.21 + * Thu Mar 03 2011 Miroslav Lichvar - 1.20-1 - update to 1.20 - fix requires diff --git a/sources b/sources index 7f74153..fac524f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -03996d474a696e59fdddbee87fc9519c libidn-1.20.tar.gz +80aba4e9503cd3ba6725cdbf265550f8 libidn-1.21.tar.gz From 60c012ae359bcf35e05980f6be10d18c58064a88 Mon Sep 17 00:00:00 2001 From: Miroslav Lichvar Date: Thu, 5 May 2011 13:35:33 +0200 Subject: [PATCH 069/157] update to 1.22 --- .gitignore | 4 +--- libidn.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index a48cbb1..c4b44ee 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1 @@ -libidn-1.19.tar.gz -/libidn-1.20.tar.gz -/libidn-1.21.tar.gz +/libidn-1.22.tar.gz diff --git a/libidn.spec b/libidn.spec index dc3a9f1..70729b8 100644 --- a/libidn.spec +++ b/libidn.spec @@ -1,6 +1,6 @@ Summary: Internationalized Domain Name support library Name: libidn -Version: 1.21 +Version: 1.22 Release: 1%{?dist} URL: http://www.gnu.org/software/libidn/ License: LGPLv2+ and GPLv3+ and GFDL @@ -105,6 +105,9 @@ rm -rf %{buildroot} %{_mandir}/man3/* %changelog +* Thu May 05 2011 Miroslav Lichvar - 1.22-1 +- update to 1.22 + * Tue Apr 26 2011 Miroslav Lichvar - 1.21-1 - update to 1.21 diff --git a/sources b/sources index fac524f..3bc89a3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -80aba4e9503cd3ba6725cdbf265550f8 libidn-1.21.tar.gz +893a1df0cf3b28b72d248382eaeaca71 libidn-1.22.tar.gz From 97cb5d881f525773486746bed22e6583a139dc05 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Sun, 29 May 2011 23:44:17 +0300 Subject: [PATCH 070/157] Byte compile Emacs lisp files, require emacs-filesystem for dir ownership. http://fedoraproject.org/wiki/Packaging:Emacs --- libidn.spec | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/libidn.spec b/libidn.spec index 70729b8..0f2932b 100644 --- a/libidn.spec +++ b/libidn.spec @@ -1,13 +1,14 @@ Summary: Internationalized Domain Name support library Name: libidn Version: 1.22 -Release: 1%{?dist} +Release: 2%{?dist} URL: http://www.gnu.org/software/libidn/ License: LGPLv2+ and GPLv3+ and GFDL Source0: http://ftp.gnu.org/gnu/libidn/libidn-%{version}.tar.gz Group: System Environment/Libraries BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: pkgconfig, gettext +BuildRequires: pkgconfig, gettext, emacs +Requires: emacs-filesystem Requires(post): /sbin/install-info /sbin/ldconfig Requires(preun): /sbin/install-info Requires(postun): /sbin/ldconfig @@ -71,6 +72,8 @@ ln -sf ../../%{_lib}/`basename ${lib}` $RPM_BUILD_ROOT%{_libdir}/libidn.so sed -i 's,^libdir=.*$,libdir=%{_libdir},' \ $RPM_BUILD_ROOT%{_libdir}/pkgconfig/libidn.pc +%{_emacs_bytecompile} $RPM_BUILD_ROOT%{_emacs_sitelispdir}/*.el + %find_lang %{name} %post @@ -92,7 +95,8 @@ rm -rf %{buildroot} %doc AUTHORS NEWS FAQ README THANKS COPYING* %{_bindir}/idn %{_mandir}/man1/idn.1* -%{_datadir}/emacs/site-lisp +%{_emacs_sitelispdir}/*.el +%{_emacs_sitelispdir}/*.elc /%{_lib}/libidn.so.* %{_infodir}/%{name}.info.gz @@ -105,6 +109,9 @@ rm -rf %{buildroot} %{_mandir}/man3/* %changelog +* Sun May 29 2011 Ville Skyttä - 1.22-2 +- Byte compile Emacs lisp files, require emacs-filesystem for dir ownership. + * Thu May 05 2011 Miroslav Lichvar - 1.22-1 - update to 1.22 From a86e7952cee7eae022fee6a15115be5987ae9060 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Tue, 31 May 2011 21:27:28 +0300 Subject: [PATCH 071/157] Split emacs-libidn subpackage to avoid *.elc arch conflicts (#709136). --- libidn.spec | 30 +++++++++++++++++++++++------- 1 file changed, 23 insertions(+), 7 deletions(-) diff --git a/libidn.spec b/libidn.spec index 0f2932b..e2948c6 100644 --- a/libidn.spec +++ b/libidn.spec @@ -1,14 +1,13 @@ Summary: Internationalized Domain Name support library Name: libidn Version: 1.22 -Release: 2%{?dist} +Release: 3%{?dist} URL: http://www.gnu.org/software/libidn/ License: LGPLv2+ and GPLv3+ and GFDL Source0: http://ftp.gnu.org/gnu/libidn/libidn-%{version}.tar.gz Group: System Environment/Libraries BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: pkgconfig, gettext, emacs -Requires: emacs-filesystem +BuildRequires: pkgconfig, gettext Requires(post): /sbin/install-info /sbin/ldconfig Requires(preun): /sbin/install-info Requires(postun): /sbin/ldconfig @@ -29,6 +28,17 @@ Requires: pkgconfig This package includes header files and libraries necessary for developing programs which use the GNU libidn library. +%package -n emacs-%{name} +Summary: GNU Emacs libidn support files +License: GPLv3+ +BuildRequires: emacs +Requires: %{name} = %{version}-%{release} +Requires: emacs(bin) >= %{_emacs_version} +BuildArch: noarch + +%description -n emacs-%{name} +This package includes libidn support files for GNU Emacs. + %prep %setup -q @@ -39,7 +49,7 @@ iconv -f ISO-8859-1 -t UTF-8 doc/libidn.info > iconv.tmp mv iconv.tmp doc/libidn.info %build -%configure --disable-csharp --disable-static --libdir=/%{_lib} +%configure --disable-csharp --disable-static --libdir=/%{_lib} --with-lispdir=%{_emacs_sitelispdir}/%{name} make %{?_smp_mflags} %check @@ -72,7 +82,7 @@ ln -sf ../../%{_lib}/`basename ${lib}` $RPM_BUILD_ROOT%{_libdir}/libidn.so sed -i 's,^libdir=.*$,libdir=%{_libdir},' \ $RPM_BUILD_ROOT%{_libdir}/pkgconfig/libidn.pc -%{_emacs_bytecompile} $RPM_BUILD_ROOT%{_emacs_sitelispdir}/*.el +%{_emacs_bytecompile} $RPM_BUILD_ROOT%{_emacs_sitelispdir}/%{name}/*.el %find_lang %{name} @@ -95,8 +105,6 @@ rm -rf %{buildroot} %doc AUTHORS NEWS FAQ README THANKS COPYING* %{_bindir}/idn %{_mandir}/man1/idn.1* -%{_emacs_sitelispdir}/*.el -%{_emacs_sitelispdir}/*.elc /%{_lib}/libidn.so.* %{_infodir}/%{name}.info.gz @@ -108,7 +116,15 @@ rm -rf %{buildroot} %{_libdir}/pkgconfig/*.pc %{_mandir}/man3/* +%files -n emacs-%{name} +%defattr(-,root,root) +%{_emacs_sitelispdir}/%{name} + + %changelog +* Tue May 31 2011 Ville Skyttä - 1.22-3 +- Split emacs-libidn subpackage to avoid *.elc arch conflicts (#709136). + * Sun May 29 2011 Ville Skyttä - 1.22-2 - Byte compile Emacs lisp files, require emacs-filesystem for dir ownership. From 69b2629ec97b5bcfa90402b545493961f894874c Mon Sep 17 00:00:00 2001 From: Miroslav Lichvar Date: Fri, 25 Nov 2011 13:54:43 +0100 Subject: [PATCH 072/157] update to 1.23 --- .gitignore | 2 +- libidn.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index c4b44ee..0988be1 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/libidn-1.22.tar.gz +/libidn-1.23.tar.gz diff --git a/libidn.spec b/libidn.spec index e2948c6..08d37f6 100644 --- a/libidn.spec +++ b/libidn.spec @@ -1,7 +1,7 @@ Summary: Internationalized Domain Name support library Name: libidn -Version: 1.22 -Release: 3%{?dist} +Version: 1.23 +Release: 1%{?dist} URL: http://www.gnu.org/software/libidn/ License: LGPLv2+ and GPLv3+ and GFDL Source0: http://ftp.gnu.org/gnu/libidn/libidn-%{version}.tar.gz @@ -122,6 +122,9 @@ rm -rf %{buildroot} %changelog +* Fri Nov 25 2011 Miroslav Lichvar - 1.23-1 +- update to 1.23 + * Tue May 31 2011 Ville Skyttä - 1.22-3 - Split emacs-libidn subpackage to avoid *.elc arch conflicts (#709136). diff --git a/sources b/sources index 3bc89a3..ce5f41c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -893a1df0cf3b28b72d248382eaeaca71 libidn-1.22.tar.gz +f9a417270cc9b6bf763ae1f88e60191c libidn-1.23.tar.gz From f90924b5d74fccf57bfa779a0c456eda2cf75a2e Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Fri, 13 Jan 2012 01:52:54 -0600 Subject: [PATCH 073/157] - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild --- libidn.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libidn.spec b/libidn.spec index 08d37f6..557d1c5 100644 --- a/libidn.spec +++ b/libidn.spec @@ -1,7 +1,7 @@ Summary: Internationalized Domain Name support library Name: libidn Version: 1.23 -Release: 1%{?dist} +Release: 2%{?dist} URL: http://www.gnu.org/software/libidn/ License: LGPLv2+ and GPLv3+ and GFDL Source0: http://ftp.gnu.org/gnu/libidn/libidn-%{version}.tar.gz @@ -122,6 +122,9 @@ rm -rf %{buildroot} %changelog +* Fri Jan 13 2012 Fedora Release Engineering - 1.23-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + * Fri Nov 25 2011 Miroslav Lichvar - 1.23-1 - update to 1.23 From ca6d376dfd4f3b62ad76c813c6d365b663a36ad4 Mon Sep 17 00:00:00 2001 From: Robert Scheck Date: Sun, 15 Jan 2012 15:11:30 +0100 Subject: [PATCH 074/157] Update to 1.24 --- .gitignore | 2 +- libidn-1.19.tar.gz.sig | 10 ---------- libidn.spec | 8 +++++--- sources | 2 +- 4 files changed, 7 insertions(+), 15 deletions(-) delete mode 100644 libidn-1.19.tar.gz.sig diff --git a/.gitignore b/.gitignore index 0988be1..7e00d4f 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/libidn-1.23.tar.gz +/libidn-1.24.tar.gz diff --git a/libidn-1.19.tar.gz.sig b/libidn-1.19.tar.gz.sig deleted file mode 100644 index a3c4c0e..0000000 --- a/libidn-1.19.tar.gz.sig +++ /dev/null @@ -1,10 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.10 (GNU/Linux) - -iOoEAAECADQFAkv3wcEtFIAAAAAAFQAPcGthLWFkZHJlc3NAZ251cGcub3JnamFz -QGV4dHVuZG8uY29tAAoJEO2iHpS1ZXFvYTwFALThMWr9YUKBvWIyAYsuo0nN0ozf -qE/bSAw2+ThQ6RDo25y9FmMSDuzbQV5rM/10QJ0kAWAJ84QPUCkuO+c46960i1bq -oMFbGs9BUrAoYpD0g/5EpTOc+gvx5aNnK59gD451jJqGoyZG32TvB5nDGEarpJwR -SFg4QPPVD661stqOKxSClgdGoxV0BUkd2YnZYECJxge0WOdPLpVZQuwkBtg= -=tpYr ------END PGP SIGNATURE----- diff --git a/libidn.spec b/libidn.spec index 557d1c5..72f69ae 100644 --- a/libidn.spec +++ b/libidn.spec @@ -1,7 +1,7 @@ Summary: Internationalized Domain Name support library Name: libidn -Version: 1.23 -Release: 2%{?dist} +Version: 1.24 +Release: 1%{?dist} URL: http://www.gnu.org/software/libidn/ License: LGPLv2+ and GPLv3+ and GFDL Source0: http://ftp.gnu.org/gnu/libidn/libidn-%{version}.tar.gz @@ -120,8 +120,10 @@ rm -rf %{buildroot} %defattr(-,root,root) %{_emacs_sitelispdir}/%{name} - %changelog +* Sun Jan 15 2012 Robert Scheck - 1.24-1 +- Update to 1.24 (#781379) + * Fri Jan 13 2012 Fedora Release Engineering - 1.23-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild diff --git a/sources b/sources index ce5f41c..36e6a52 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -f9a417270cc9b6bf763ae1f88e60191c libidn-1.23.tar.gz +764d7258eeb273941680499fab2c7367 libidn-1.24.tar.gz From 2f7150652e7f8c9f3d5eb38e225b05cd9a75e973 Mon Sep 17 00:00:00 2001 From: Miroslav Lichvar Date: Tue, 15 May 2012 16:41:10 +0200 Subject: [PATCH 075/157] Provide bundled(gnulib) (#821768) --- libidn.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/libidn.spec b/libidn.spec index 72f69ae..b54a572 100644 --- a/libidn.spec +++ b/libidn.spec @@ -1,7 +1,7 @@ Summary: Internationalized Domain Name support library Name: libidn Version: 1.24 -Release: 1%{?dist} +Release: 2%{?dist} URL: http://www.gnu.org/software/libidn/ License: LGPLv2+ and GPLv3+ and GFDL Source0: http://ftp.gnu.org/gnu/libidn/libidn-%{version}.tar.gz @@ -11,6 +11,8 @@ BuildRequires: pkgconfig, gettext Requires(post): /sbin/install-info /sbin/ldconfig Requires(preun): /sbin/install-info Requires(postun): /sbin/ldconfig +# gnulib is a copylib, bundling is allowed +Provides: bundled(gnulib) %description GNU Libidn is an implementation of the Stringprep, Punycode and @@ -121,6 +123,9 @@ rm -rf %{buildroot} %{_emacs_sitelispdir}/%{name} %changelog +* Tue May 15 2012 Miroslav Lichvar - 1.24-2 +- provide bundled(gnulib) (#821768) + * Sun Jan 15 2012 Robert Scheck - 1.24-1 - Update to 1.24 (#781379) From eb61ce027b3fb3d972a39641683bc4ffa874b487 Mon Sep 17 00:00:00 2001 From: Joe Orton Date: Tue, 29 May 2012 09:07:24 +0100 Subject: [PATCH 076/157] update to 1.25 --- .gitignore | 2 ++ libidn.spec | 9 ++++++--- sources | 2 +- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 7e00d4f..3bf1371 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,3 @@ /libidn-1.24.tar.gz +/libidn-1.25.tar.gz +/libidn-1.?? diff --git a/libidn.spec b/libidn.spec index b54a572..a9edb95 100644 --- a/libidn.spec +++ b/libidn.spec @@ -1,6 +1,6 @@ Summary: Internationalized Domain Name support library Name: libidn -Version: 1.24 +Version: 1.25 Release: 2%{?dist} URL: http://www.gnu.org/software/libidn/ License: LGPLv2+ and GPLv3+ and GFDL @@ -52,10 +52,10 @@ mv iconv.tmp doc/libidn.info %build %configure --disable-csharp --disable-static --libdir=/%{_lib} --with-lispdir=%{_emacs_sitelispdir}/%{name} -make %{?_smp_mflags} +make %{?_smp_mflags} V=1 %check -make %{?_smp_mflags} -C tests check +make %{?_smp_mflags} -C tests check VALGRIND=env %install rm -rf %{buildroot} @@ -123,6 +123,9 @@ rm -rf %{buildroot} %{_emacs_sitelispdir}/%{name} %changelog +* Tue May 29 2012 Joe Orton - 1.25-2 +- update to 1.25 + * Tue May 15 2012 Miroslav Lichvar - 1.24-2 - provide bundled(gnulib) (#821768) diff --git a/sources b/sources index 36e6a52..229a7d0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -764d7258eeb273941680499fab2c7367 libidn-1.24.tar.gz +45ffabce4b8ca87fe98fe4542668d33d libidn-1.25.tar.gz From 2581ab8a28d9d9b4f815b5ec5d5f09b6836a5d90 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Thu, 19 Jul 2012 15:08:11 -0500 Subject: [PATCH 077/157] - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild --- libidn.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libidn.spec b/libidn.spec index a9edb95..9fb11be 100644 --- a/libidn.spec +++ b/libidn.spec @@ -1,7 +1,7 @@ Summary: Internationalized Domain Name support library Name: libidn Version: 1.25 -Release: 2%{?dist} +Release: 3%{?dist} URL: http://www.gnu.org/software/libidn/ License: LGPLv2+ and GPLv3+ and GFDL Source0: http://ftp.gnu.org/gnu/libidn/libidn-%{version}.tar.gz @@ -123,6 +123,9 @@ rm -rf %{buildroot} %{_emacs_sitelispdir}/%{name} %changelog +* Thu Jul 19 2012 Fedora Release Engineering - 1.25-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + * Tue May 29 2012 Joe Orton - 1.25-2 - update to 1.25 From c9d8bd58dbdd9c1e0693d194d1ec0f8baa5dd561 Mon Sep 17 00:00:00 2001 From: Miroslav Lichvar Date: Mon, 17 Dec 2012 12:21:44 +0100 Subject: [PATCH 078/157] update to 1.26 --- .gitignore | 3 +-- libidn.spec | 7 +++++-- sources | 2 +- upstream | 2 +- 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 3bf1371..a9cec32 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,2 @@ -/libidn-1.24.tar.gz -/libidn-1.25.tar.gz /libidn-1.?? +/libidn-1.26.tar.gz diff --git a/libidn.spec b/libidn.spec index 9fb11be..fd1c37c 100644 --- a/libidn.spec +++ b/libidn.spec @@ -1,7 +1,7 @@ Summary: Internationalized Domain Name support library Name: libidn -Version: 1.25 -Release: 3%{?dist} +Version: 1.26 +Release: 1%{?dist} URL: http://www.gnu.org/software/libidn/ License: LGPLv2+ and GPLv3+ and GFDL Source0: http://ftp.gnu.org/gnu/libidn/libidn-%{version}.tar.gz @@ -123,6 +123,9 @@ rm -rf %{buildroot} %{_emacs_sitelispdir}/%{name} %changelog +* Mon Dec 17 2012 Miroslav Lichvar - 1.26-1 +- update to 1.26 + * Thu Jul 19 2012 Fedora Release Engineering - 1.25-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild diff --git a/sources b/sources index 229a7d0..0b41bac 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -45ffabce4b8ca87fe98fe4542668d33d libidn-1.25.tar.gz +7533d14fbbb6c026a1a9eaa2179ccb69 libidn-1.26.tar.gz diff --git a/upstream b/upstream index 0cde68b..18f7897 100644 --- a/upstream +++ b/upstream @@ -1 +1 @@ -libidn-1.19.tar.gz +libidn-1.26.tar.gz From 891d96350ba2a9337bf4dc28b1543709b9f6a6be Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 13 Feb 2013 22:33:00 -0600 Subject: [PATCH 079/157] - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild --- libidn.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libidn.spec b/libidn.spec index fd1c37c..088bc6d 100644 --- a/libidn.spec +++ b/libidn.spec @@ -1,7 +1,7 @@ Summary: Internationalized Domain Name support library Name: libidn Version: 1.26 -Release: 1%{?dist} +Release: 2%{?dist} URL: http://www.gnu.org/software/libidn/ License: LGPLv2+ and GPLv3+ and GFDL Source0: http://ftp.gnu.org/gnu/libidn/libidn-%{version}.tar.gz @@ -123,6 +123,9 @@ rm -rf %{buildroot} %{_emacs_sitelispdir}/%{name} %changelog +* Thu Feb 14 2013 Fedora Release Engineering - 1.26-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + * Mon Dec 17 2012 Miroslav Lichvar - 1.26-1 - update to 1.26 From 13db08138e3b7aeb9d2dc1528150ec02ca86c239 Mon Sep 17 00:00:00 2001 From: Miroslav Lichvar Date: Fri, 7 Jun 2013 11:44:11 +0200 Subject: [PATCH 080/157] remove obsolete macros --- libidn.spec | 8 -------- 1 file changed, 8 deletions(-) diff --git a/libidn.spec b/libidn.spec index 088bc6d..878c006 100644 --- a/libidn.spec +++ b/libidn.spec @@ -6,7 +6,6 @@ URL: http://www.gnu.org/software/libidn/ License: LGPLv2+ and GPLv3+ and GFDL Source0: http://ftp.gnu.org/gnu/libidn/libidn-%{version}.tar.gz Group: System Environment/Libraries -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: pkgconfig, gettext Requires(post): /sbin/install-info /sbin/ldconfig Requires(preun): /sbin/install-info @@ -58,7 +57,6 @@ make %{?_smp_mflags} V=1 make %{?_smp_mflags} -C tests check VALGRIND=env %install -rm -rf %{buildroot} make install DESTDIR=$RPM_BUILD_ROOT pkgconfigdir=%{_libdir}/pkgconfig # provide more examples @@ -99,11 +97,7 @@ fi %postun -p /sbin/ldconfig -%clean -rm -rf %{buildroot} - %files -f %{name}.lang -%defattr(-,root,root) %doc AUTHORS NEWS FAQ README THANKS COPYING* %{_bindir}/idn %{_mandir}/man1/idn.1* @@ -111,7 +105,6 @@ rm -rf %{buildroot} %{_infodir}/%{name}.info.gz %files devel -%defattr(0644,root,root,755) %doc doc/libidn.html examples %{_libdir}/libidn.so %{_includedir}/*.h @@ -119,7 +112,6 @@ rm -rf %{buildroot} %{_mandir}/man3/* %files -n emacs-%{name} -%defattr(-,root,root) %{_emacs_sitelispdir}/%{name} %changelog From db480dd680e6e19cb95cb5029508fbf76195c5d3 Mon Sep 17 00:00:00 2001 From: Miroslav Lichvar Date: Fri, 7 Jun 2013 11:44:36 +0200 Subject: [PATCH 081/157] make devel dependency arch-specific --- libidn.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libidn.spec b/libidn.spec index 878c006..704efcb 100644 --- a/libidn.spec +++ b/libidn.spec @@ -22,7 +22,7 @@ names. %package devel Summary: Development files for the libidn library Group: Development/Libraries -Requires: %{name} = %{version}-%{release} +Requires: %{name}%{?_isa} = %{version}-%{release} Requires: pkgconfig %description devel From d3868d3e02105154239567504646f850f0c0fd26 Mon Sep 17 00:00:00 2001 From: Miroslav Lichvar Date: Fri, 7 Jun 2013 11:55:46 +0200 Subject: [PATCH 082/157] update to 1.27 --- .gitignore | 2 +- libidn.spec | 2 +- sources | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index a9cec32..7f36a32 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ /libidn-1.?? -/libidn-1.26.tar.gz +/libidn-1.27.tar.gz diff --git a/libidn.spec b/libidn.spec index 704efcb..3355ae7 100644 --- a/libidn.spec +++ b/libidn.spec @@ -1,6 +1,6 @@ Summary: Internationalized Domain Name support library Name: libidn -Version: 1.26 +Version: 1.27 Release: 2%{?dist} URL: http://www.gnu.org/software/libidn/ License: LGPLv2+ and GPLv3+ and GFDL diff --git a/sources b/sources index 0b41bac..b8e9fcc 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -7533d14fbbb6c026a1a9eaa2179ccb69 libidn-1.26.tar.gz +3a0803551893d3d09efd472ff71c8028 libidn-1.27.tar.gz From 1c9103b7e9224d5344ed57c3a468b2676ac4ab77 Mon Sep 17 00:00:00 2001 From: Miroslav Lichvar Date: Fri, 7 Jun 2013 11:57:15 +0200 Subject: [PATCH 083/157] 1.27-1 --- libidn.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/libidn.spec b/libidn.spec index 3355ae7..3957ec0 100644 --- a/libidn.spec +++ b/libidn.spec @@ -1,7 +1,7 @@ Summary: Internationalized Domain Name support library Name: libidn Version: 1.27 -Release: 2%{?dist} +Release: 1%{?dist} URL: http://www.gnu.org/software/libidn/ License: LGPLv2+ and GPLv3+ and GFDL Source0: http://ftp.gnu.org/gnu/libidn/libidn-%{version}.tar.gz @@ -115,6 +115,11 @@ fi %{_emacs_sitelispdir}/%{name} %changelog +* Fri Jun 07 2013 Miroslav Lichvar - 1.27-1 +- update to 1.27 +- make devel dependency arch-specific +- remove obsolete macros + * Thu Feb 14 2013 Fedora Release Engineering - 1.26-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild From 2d23414e54becdf20a02fb5a3a924f55e5085955 Mon Sep 17 00:00:00 2001 From: Miroslav Lichvar Date: Thu, 18 Jul 2013 17:59:48 +0200 Subject: [PATCH 084/157] update to 1.28 --- .gitignore | 2 +- libidn.spec | 2 +- sources | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 7f36a32..c8ce883 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ /libidn-1.?? -/libidn-1.27.tar.gz +/libidn-1.28.tar.gz diff --git a/libidn.spec b/libidn.spec index 3957ec0..750df25 100644 --- a/libidn.spec +++ b/libidn.spec @@ -1,6 +1,6 @@ Summary: Internationalized Domain Name support library Name: libidn -Version: 1.27 +Version: 1.28 Release: 1%{?dist} URL: http://www.gnu.org/software/libidn/ License: LGPLv2+ and GPLv3+ and GFDL diff --git a/sources b/sources index b8e9fcc..9b2b648 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -3a0803551893d3d09efd472ff71c8028 libidn-1.27.tar.gz +43a6f14b16559e10a492acc65c4b0acc libidn-1.28.tar.gz From 7bafefd77509100ffc87daabefcd89168c534567 Mon Sep 17 00:00:00 2001 From: Miroslav Lichvar Date: Thu, 18 Jul 2013 18:15:12 +0200 Subject: [PATCH 085/157] move library to /usr --- libidn.spec | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/libidn.spec b/libidn.spec index 750df25..07d1b24 100644 --- a/libidn.spec +++ b/libidn.spec @@ -50,7 +50,7 @@ iconv -f ISO-8859-1 -t UTF-8 doc/libidn.info > iconv.tmp mv iconv.tmp doc/libidn.info %build -%configure --disable-csharp --disable-static --libdir=/%{_lib} --with-lispdir=%{_emacs_sitelispdir}/%{name} +%configure --disable-csharp --disable-static --with-lispdir=%{_emacs_sitelispdir}/%{name} make %{?_smp_mflags} V=1 %check @@ -69,19 +69,9 @@ rm -rf $RPM_BUILD_ROOT%{_datadir}/info/dir # Make multilib safe: sed -i '/gnu compiler/d' $RPM_BUILD_ROOT%{_includedir}/idn-int.h -rm -f $RPM_BUILD_ROOT/%{_lib}/*.la \ +rm -f $RPM_BUILD_ROOT%{_libdir}/*.la \ $RPM_BUILD_ROOT%{_datadir}/info/*.png -mkdir -p $RPM_BUILD_ROOT%{_libdir} -mv $RPM_BUILD_ROOT/%{_lib}/libidn.so $RPM_BUILD_ROOT%{_libdir} - -lib=`echo $RPM_BUILD_ROOT/%{_lib}/libidn.so.*.*` -ln -sf ../../%{_lib}/`basename ${lib}` $RPM_BUILD_ROOT%{_libdir}/libidn.so - -# Fix the .pc file to reference the directory which contains the .so -sed -i 's,^libdir=.*$,libdir=%{_libdir},' \ - $RPM_BUILD_ROOT%{_libdir}/pkgconfig/libidn.pc - %{_emacs_bytecompile} $RPM_BUILD_ROOT%{_emacs_sitelispdir}/%{name}/*.el %find_lang %{name} @@ -101,7 +91,7 @@ fi %doc AUTHORS NEWS FAQ README THANKS COPYING* %{_bindir}/idn %{_mandir}/man1/idn.1* -/%{_lib}/libidn.so.* +%{_libdir}/libidn.so.* %{_infodir}/%{name}.info.gz %files devel From 0f37cb72b03f0addd65d4bab8dfe69c7a94a1454 Mon Sep 17 00:00:00 2001 From: Miroslav Lichvar Date: Thu, 18 Jul 2013 18:38:07 +0200 Subject: [PATCH 086/157] remove RPATH hardcoding --- libidn.spec | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/libidn.spec b/libidn.spec index 07d1b24..efa2f18 100644 --- a/libidn.spec +++ b/libidn.spec @@ -51,9 +51,16 @@ mv iconv.tmp doc/libidn.info %build %configure --disable-csharp --disable-static --with-lispdir=%{_emacs_sitelispdir}/%{name} + +# remove RPATH hardcoding +sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool +sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool + make %{?_smp_mflags} V=1 %check +# without RPATH this needs to be set to test the compiled library +export LD_LIBRARY_PATH=$(pwd)/lib/.libs make %{?_smp_mflags} -C tests check VALGRIND=env %install From 3975e6fa146a4e35d2fcebe9ccfb6fe74692316c Mon Sep 17 00:00:00 2001 From: Miroslav Lichvar Date: Thu, 18 Jul 2013 18:38:58 +0200 Subject: [PATCH 087/157] 1.28-1 --- libidn.spec | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/libidn.spec b/libidn.spec index efa2f18..7aa0221 100644 --- a/libidn.spec +++ b/libidn.spec @@ -112,6 +112,11 @@ fi %{_emacs_sitelispdir}/%{name} %changelog +* Thu Jul 18 2013 Miroslav Lichvar - 1.28-1 +- update to 1.28 +- remove RPATH hardcoding +- move library to /usr + * Fri Jun 07 2013 Miroslav Lichvar - 1.27-1 - update to 1.27 - make devel dependency arch-specific From 216a7b800fdd36827ef42c555b35d8a277874cb0 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 3 Aug 2013 00:49:34 -0500 Subject: [PATCH 088/157] - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild --- libidn.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libidn.spec b/libidn.spec index 7aa0221..c0ccbab 100644 --- a/libidn.spec +++ b/libidn.spec @@ -1,7 +1,7 @@ Summary: Internationalized Domain Name support library Name: libidn Version: 1.28 -Release: 1%{?dist} +Release: 2%{?dist} URL: http://www.gnu.org/software/libidn/ License: LGPLv2+ and GPLv3+ and GFDL Source0: http://ftp.gnu.org/gnu/libidn/libidn-%{version}.tar.gz @@ -112,6 +112,9 @@ fi %{_emacs_sitelispdir}/%{name} %changelog +* Sat Aug 03 2013 Fedora Release Engineering - 1.28-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + * Thu Jul 18 2013 Miroslav Lichvar - 1.28-1 - update to 1.28 - remove RPATH hardcoding From af9edd6d4f758d20ee87aa799db98c6ba4f63d07 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Fri, 6 Jun 2014 22:50:49 -0500 Subject: [PATCH 089/157] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild --- libidn.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libidn.spec b/libidn.spec index c0ccbab..88db86b 100644 --- a/libidn.spec +++ b/libidn.spec @@ -1,7 +1,7 @@ Summary: Internationalized Domain Name support library Name: libidn Version: 1.28 -Release: 2%{?dist} +Release: 3%{?dist} URL: http://www.gnu.org/software/libidn/ License: LGPLv2+ and GPLv3+ and GFDL Source0: http://ftp.gnu.org/gnu/libidn/libidn-%{version}.tar.gz @@ -112,6 +112,9 @@ fi %{_emacs_sitelispdir}/%{name} %changelog +* Sat Jun 07 2014 Fedora Release Engineering - 1.28-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + * Sat Aug 03 2013 Fedora Release Engineering - 1.28-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild From 2b61f96efd94d8d8b994683c7e42cab99e8de862 Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Fri, 18 Jul 2014 14:56:47 -0400 Subject: [PATCH 090/157] fix license handling --- libidn.spec | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/libidn.spec b/libidn.spec index 88db86b..823f0aa 100644 --- a/libidn.spec +++ b/libidn.spec @@ -1,7 +1,7 @@ Summary: Internationalized Domain Name support library Name: libidn Version: 1.28 -Release: 3%{?dist} +Release: 4%{?dist} URL: http://www.gnu.org/software/libidn/ License: LGPLv2+ and GPLv3+ and GFDL Source0: http://ftp.gnu.org/gnu/libidn/libidn-%{version}.tar.gz @@ -95,7 +95,9 @@ fi %postun -p /sbin/ldconfig %files -f %{name}.lang -%doc AUTHORS NEWS FAQ README THANKS COPYING* +%{!?_licensedir:%global license %%doc} +%license COPYING* +%doc AUTHORS NEWS FAQ README THANKS %{_bindir}/idn %{_mandir}/man1/idn.1* %{_libdir}/libidn.so.* @@ -112,6 +114,9 @@ fi %{_emacs_sitelispdir}/%{name} %changelog +* Fri Jul 18 2014 Tom Callaway - 1.28-4 +- fix license handling + * Sat Jun 07 2014 Fedora Release Engineering - 1.28-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild From 4160176a5e1c5c4b99ce78119876ab6c6fd2c1c2 Mon Sep 17 00:00:00 2001 From: Miroslav Lichvar Date: Wed, 13 Aug 2014 17:18:57 +0200 Subject: [PATCH 091/157] update to 1.29 --- .gitignore | 2 +- libidn.spec | 2 +- sources | 2 +- upstream | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index c8ce883..8901c60 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ /libidn-1.?? -/libidn-1.28.tar.gz +/libidn-1.29.tar.gz diff --git a/libidn.spec b/libidn.spec index 823f0aa..f8f03b4 100644 --- a/libidn.spec +++ b/libidn.spec @@ -1,6 +1,6 @@ Summary: Internationalized Domain Name support library Name: libidn -Version: 1.28 +Version: 1.29 Release: 4%{?dist} URL: http://www.gnu.org/software/libidn/ License: LGPLv2+ and GPLv3+ and GFDL diff --git a/sources b/sources index 9b2b648..1a4b019 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -43a6f14b16559e10a492acc65c4b0acc libidn-1.28.tar.gz +2b67bb507207af379f9461e1307dc84b libidn-1.29.tar.gz diff --git a/upstream b/upstream index 18f7897..a87f6c3 100644 --- a/upstream +++ b/upstream @@ -1 +1 @@ -libidn-1.26.tar.gz +libidn-1.29.tar.gz From f3c3040e9d4fdbbd2d4c751cfdd65b5b5c1d2b0f Mon Sep 17 00:00:00 2001 From: Miroslav Lichvar Date: Wed, 13 Aug 2014 17:19:43 +0200 Subject: [PATCH 092/157] 1.29-1 --- libidn.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libidn.spec b/libidn.spec index f8f03b4..b50c727 100644 --- a/libidn.spec +++ b/libidn.spec @@ -1,7 +1,7 @@ Summary: Internationalized Domain Name support library Name: libidn Version: 1.29 -Release: 4%{?dist} +Release: 1%{?dist} URL: http://www.gnu.org/software/libidn/ License: LGPLv2+ and GPLv3+ and GFDL Source0: http://ftp.gnu.org/gnu/libidn/libidn-%{version}.tar.gz @@ -114,6 +114,9 @@ fi %{_emacs_sitelispdir}/%{name} %changelog +* Wed Aug 13 2014 Miroslav Lichvar - 1.29-1 +- update to 1.29 + * Fri Jul 18 2014 Tom Callaway - 1.28-4 - fix license handling From 27b5096e482961330b151669488913a60c48531b Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Sun, 17 Aug 2014 03:55:12 +0000 Subject: [PATCH 093/157] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild --- libidn.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libidn.spec b/libidn.spec index b50c727..8c91f8c 100644 --- a/libidn.spec +++ b/libidn.spec @@ -1,7 +1,7 @@ Summary: Internationalized Domain Name support library Name: libidn Version: 1.29 -Release: 1%{?dist} +Release: 2%{?dist} URL: http://www.gnu.org/software/libidn/ License: LGPLv2+ and GPLv3+ and GFDL Source0: http://ftp.gnu.org/gnu/libidn/libidn-%{version}.tar.gz @@ -114,6 +114,9 @@ fi %{_emacs_sitelispdir}/%{name} %changelog +* Sun Aug 17 2014 Fedora Release Engineering - 1.29-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + * Wed Aug 13 2014 Miroslav Lichvar - 1.29-1 - update to 1.29 From fb36d1c8e4e14c4a9d1aefa00c0758334ac6143e Mon Sep 17 00:00:00 2001 From: Till Maas Date: Sat, 21 Feb 2015 22:27:50 +0100 Subject: [PATCH 094/157] Rebuilt for Fedora 23 Change https://fedoraproject.org/wiki/Changes/Harden_all_packages_with_position-independent_code --- libidn.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/libidn.spec b/libidn.spec index 8c91f8c..74f50bc 100644 --- a/libidn.spec +++ b/libidn.spec @@ -1,7 +1,7 @@ Summary: Internationalized Domain Name support library Name: libidn Version: 1.29 -Release: 2%{?dist} +Release: 3%{?dist} URL: http://www.gnu.org/software/libidn/ License: LGPLv2+ and GPLv3+ and GFDL Source0: http://ftp.gnu.org/gnu/libidn/libidn-%{version}.tar.gz @@ -114,6 +114,10 @@ fi %{_emacs_sitelispdir}/%{name} %changelog +* Sat Feb 21 2015 Till Maas - 1.29-3 +- Rebuilt for Fedora 23 Change + https://fedoraproject.org/wiki/Changes/Harden_all_packages_with_position-independent_code + * Sun Aug 17 2014 Fedora Release Engineering - 1.29-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild From 4bafc96ee65443fdf88cec1e13ed909ff1a8dc61 Mon Sep 17 00:00:00 2001 From: Miroslav Lichvar Date: Mon, 2 Mar 2015 14:10:38 +0100 Subject: [PATCH 095/157] update to 1.30 --- .gitignore | 2 +- libidn.spec | 2 +- sources | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 8901c60..da76511 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ /libidn-1.?? -/libidn-1.29.tar.gz +/libidn-1.30.tar.gz diff --git a/libidn.spec b/libidn.spec index 74f50bc..7a80840 100644 --- a/libidn.spec +++ b/libidn.spec @@ -1,6 +1,6 @@ Summary: Internationalized Domain Name support library Name: libidn -Version: 1.29 +Version: 1.30 Release: 3%{?dist} URL: http://www.gnu.org/software/libidn/ License: LGPLv2+ and GPLv3+ and GFDL diff --git a/sources b/sources index 1a4b019..43be9e2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -2b67bb507207af379f9461e1307dc84b libidn-1.29.tar.gz +b17edc8551cd31cc5f14c82a9dabf58e libidn-1.30.tar.gz From 3df0c9d5b9f9f38ea5f525417493053a2211a114 Mon Sep 17 00:00:00 2001 From: Miroslav Lichvar Date: Mon, 2 Mar 2015 14:15:02 +0100 Subject: [PATCH 096/157] 1.30-1 --- libidn.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libidn.spec b/libidn.spec index 7a80840..1f3b5a3 100644 --- a/libidn.spec +++ b/libidn.spec @@ -1,7 +1,7 @@ Summary: Internationalized Domain Name support library Name: libidn Version: 1.30 -Release: 3%{?dist} +Release: 1%{?dist} URL: http://www.gnu.org/software/libidn/ License: LGPLv2+ and GPLv3+ and GFDL Source0: http://ftp.gnu.org/gnu/libidn/libidn-%{version}.tar.gz @@ -114,6 +114,9 @@ fi %{_emacs_sitelispdir}/%{name} %changelog +* Mon Mar 02 2015 Miroslav Lichvar - 1.30-1 +- update to 1.30 + * Sat Feb 21 2015 Till Maas - 1.29-3 - Rebuilt for Fedora 23 Change https://fedoraproject.org/wiki/Changes/Harden_all_packages_with_position-independent_code From 6a840e30b3d22731c80df40fddb9ff089948393b Mon Sep 17 00:00:00 2001 From: gil Date: Tue, 31 Mar 2015 16:11:34 +0200 Subject: [PATCH 097/157] build java libidn library --- libidn.spec | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 51 insertions(+), 3 deletions(-) diff --git a/libidn.spec b/libidn.spec index 1f3b5a3..eb7460d 100644 --- a/libidn.spec +++ b/libidn.spec @@ -1,7 +1,7 @@ Summary: Internationalized Domain Name support library Name: libidn Version: 1.30 -Release: 1%{?dist} +Release: 2%{?dist} URL: http://www.gnu.org/software/libidn/ License: LGPLv2+ and GPLv3+ and GFDL Source0: http://ftp.gnu.org/gnu/libidn/libidn-%{version}.tar.gz @@ -40,9 +40,39 @@ BuildArch: noarch %description -n emacs-%{name} This package includes libidn support files for GNU Emacs. +%package java +Summary: Java port of the GNU Libidn library +BuildRequires: java-devel +BuildRequires: javapackages-local +BuildRequires: mvn(com.google.code.findbugs:annotations) +BuildRequires: mvn(com.google.guava:guava) +BuildRequires: mvn(junit:junit) +BuildArch: noarch + +%description java +GNU Libidn is a fully documented implementation of the Stringprep, +Punycode and IDNA specifications. Libidn's purpose is to encode +and decode internationalized domain names. + +This package contains the native Java port of the library. + +%package javadoc +Summary: Javadoc for %{name}-java +BuildArch: noarch + +%description javadoc +This package contains javadoc for %{name}-java. + %prep %setup -q +# Cleanup +find . -name '*.jar' -print -delete +find . -name '*.class' -print -delete + +# Not available test dep +%pom_remove_dep com.google.caliper:caliper java/pom.xml.in + # Name directory sections consistently in the info file, #209491 sed -i '/^INFO-DIR-SECTION/{s/GNU Libraries/Libraries/;s/GNU utilities/Utilities/;}' doc/libidn.info @@ -50,7 +80,7 @@ iconv -f ISO-8859-1 -t UTF-8 doc/libidn.info > iconv.tmp mv iconv.tmp doc/libidn.info %build -%configure --disable-csharp --disable-static --with-lispdir=%{_emacs_sitelispdir}/%{name} +%configure --disable-csharp --disable-static --with-lispdir=%{_emacs_sitelispdir}/%{name} --enable-java # remove RPATH hardcoding sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool @@ -64,7 +94,7 @@ export LD_LIBRARY_PATH=$(pwd)/lib/.libs make %{?_smp_mflags} -C tests check VALGRIND=env %install -make install DESTDIR=$RPM_BUILD_ROOT pkgconfigdir=%{_libdir}/pkgconfig +make install DESTDIR=$RPM_BUILD_ROOT pkgconfigdir=%{_libdir}/pkgconfig libidn_jardir=%{_javadir} # provide more examples make %{?_smp_mflags} -C examples distclean @@ -81,6 +111,15 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la \ %{_emacs_bytecompile} $RPM_BUILD_ROOT%{_emacs_sitelispdir}/%{name}/*.el +# regenerate java documentation +rm -rf doc/java/* +%javadoc -source 1.6 -d doc/java $(find java/src/main/java -name "*.java") +# generate maven depmap +rm -rf $RPM_BUILD_ROOT%{_javadir}/libidn*.jar +%mvn_artifact java/pom.xml java/libidn-%{version}.jar +%mvn_file org.gnu.inet:libidn libidn +%mvn_install -J doc/java + %find_lang %{name} %post @@ -113,7 +152,16 @@ fi %files -n emacs-%{name} %{_emacs_sitelispdir}/%{name} +%files java -f .mfiles +%license COPYING* java/LICENSE-2.0.txt + +%files javadoc -f .mfiles-javadoc +%license COPYING* java/LICENSE-2.0.txt + %changelog +* Tue Mar 31 2015 gil cattaneo 1.30-2 +- build java libidn library + * Mon Mar 02 2015 Miroslav Lichvar - 1.30-1 - update to 1.30 From d102645807739cdf451fab296aacb9b673cd490f Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 17 Jun 2015 15:50:21 +0000 Subject: [PATCH 098/157] - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild --- libidn.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libidn.spec b/libidn.spec index eb7460d..9360322 100644 --- a/libidn.spec +++ b/libidn.spec @@ -1,7 +1,7 @@ Summary: Internationalized Domain Name support library Name: libidn Version: 1.30 -Release: 2%{?dist} +Release: 3%{?dist} URL: http://www.gnu.org/software/libidn/ License: LGPLv2+ and GPLv3+ and GFDL Source0: http://ftp.gnu.org/gnu/libidn/libidn-%{version}.tar.gz @@ -159,6 +159,9 @@ fi %license COPYING* java/LICENSE-2.0.txt %changelog +* Wed Jun 17 2015 Fedora Release Engineering - 1.30-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + * Tue Mar 31 2015 gil cattaneo 1.30-2 - build java libidn library From 1790083394b83b2746dfb060871282a56afdcbda Mon Sep 17 00:00:00 2001 From: Miroslav Lichvar Date: Thu, 25 Jun 2015 14:07:01 +0200 Subject: [PATCH 099/157] merge emacs-libidn with main package (#1234563) --- libidn.spec | 21 ++++++--------------- 1 file changed, 6 insertions(+), 15 deletions(-) diff --git a/libidn.spec b/libidn.spec index 9360322..97da8c3 100644 --- a/libidn.spec +++ b/libidn.spec @@ -6,12 +6,16 @@ URL: http://www.gnu.org/software/libidn/ License: LGPLv2+ and GPLv3+ and GFDL Source0: http://ftp.gnu.org/gnu/libidn/libidn-%{version}.tar.gz Group: System Environment/Libraries -BuildRequires: pkgconfig, gettext +BuildRequires: pkgconfig gettext emacs Requires(post): /sbin/install-info /sbin/ldconfig Requires(preun): /sbin/install-info Requires(postun): /sbin/ldconfig # gnulib is a copylib, bundling is allowed Provides: bundled(gnulib) +# emacs-libidn merged with main package in 1.30-4 +Obsoletes: emacs-libidn < 1.30-4 +Provides: emacs-libidn < 1.30-4 +Requires: emacs-filesystem >= %{_emacs_version} %description GNU Libidn is an implementation of the Stringprep, Punycode and @@ -29,17 +33,6 @@ Requires: pkgconfig This package includes header files and libraries necessary for developing programs which use the GNU libidn library. -%package -n emacs-%{name} -Summary: GNU Emacs libidn support files -License: GPLv3+ -BuildRequires: emacs -Requires: %{name} = %{version}-%{release} -Requires: emacs(bin) >= %{_emacs_version} -BuildArch: noarch - -%description -n emacs-%{name} -This package includes libidn support files for GNU Emacs. - %package java Summary: Java port of the GNU Libidn library BuildRequires: java-devel @@ -141,6 +134,7 @@ fi %{_mandir}/man1/idn.1* %{_libdir}/libidn.so.* %{_infodir}/%{name}.info.gz +%{_emacs_sitelispdir}/%{name} %files devel %doc doc/libidn.html examples @@ -149,9 +143,6 @@ fi %{_libdir}/pkgconfig/*.pc %{_mandir}/man3/* -%files -n emacs-%{name} -%{_emacs_sitelispdir}/%{name} - %files java -f .mfiles %license COPYING* java/LICENSE-2.0.txt From 1746aafbfd1e604a183966bf18f5f1609b2875fb Mon Sep 17 00:00:00 2001 From: Miroslav Lichvar Date: Thu, 25 Jun 2015 14:08:15 +0200 Subject: [PATCH 100/157] 1.30-4 --- libidn.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libidn.spec b/libidn.spec index 97da8c3..4f89fd5 100644 --- a/libidn.spec +++ b/libidn.spec @@ -1,7 +1,7 @@ Summary: Internationalized Domain Name support library Name: libidn Version: 1.30 -Release: 3%{?dist} +Release: 4%{?dist} URL: http://www.gnu.org/software/libidn/ License: LGPLv2+ and GPLv3+ and GFDL Source0: http://ftp.gnu.org/gnu/libidn/libidn-%{version}.tar.gz @@ -150,6 +150,9 @@ fi %license COPYING* java/LICENSE-2.0.txt %changelog +* Thu Jun 25 2015 Miroslav Lichvar - 1.30-4 +- merge emacs-libidn with main package (#1234563) + * Wed Jun 17 2015 Fedora Release Engineering - 1.30-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild From 1a67991997ad99337846049f7b39f26ceb5efd2c Mon Sep 17 00:00:00 2001 From: Miroslav Lichvar Date: Mon, 13 Jul 2015 09:30:20 +0200 Subject: [PATCH 101/157] update to 1.31 (CVE-2015-2059) --- .gitignore | 2 +- libidn.spec | 2 +- sources | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index da76511..93a796d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ /libidn-1.?? -/libidn-1.30.tar.gz +/libidn-1.31.tar.gz diff --git a/libidn.spec b/libidn.spec index 4f89fd5..4b15c5d 100644 --- a/libidn.spec +++ b/libidn.spec @@ -1,6 +1,6 @@ Summary: Internationalized Domain Name support library Name: libidn -Version: 1.30 +Version: 1.31 Release: 4%{?dist} URL: http://www.gnu.org/software/libidn/ License: LGPLv2+ and GPLv3+ and GFDL diff --git a/sources b/sources index 43be9e2..09cd7ed 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b17edc8551cd31cc5f14c82a9dabf58e libidn-1.30.tar.gz +83806230fc0989a24cf9dfe6685563d9 libidn-1.31.tar.gz From 568adc3698ad2d280c87b2054b5e8dd312128bb7 Mon Sep 17 00:00:00 2001 From: Miroslav Lichvar Date: Mon, 13 Jul 2015 09:31:33 +0200 Subject: [PATCH 102/157] 1.31-1 --- libidn.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libidn.spec b/libidn.spec index 4b15c5d..5ed169b 100644 --- a/libidn.spec +++ b/libidn.spec @@ -1,7 +1,7 @@ Summary: Internationalized Domain Name support library Name: libidn Version: 1.31 -Release: 4%{?dist} +Release: 1%{?dist} URL: http://www.gnu.org/software/libidn/ License: LGPLv2+ and GPLv3+ and GFDL Source0: http://ftp.gnu.org/gnu/libidn/libidn-%{version}.tar.gz @@ -150,6 +150,9 @@ fi %license COPYING* java/LICENSE-2.0.txt %changelog +* Mon Jul 13 2015 Miroslav Lichvar - 1.31-1 +- update to 1.31 (CVE-2015-2059) + * Thu Jun 25 2015 Miroslav Lichvar - 1.30-4 - merge emacs-libidn with main package (#1234563) From 31cd85555d309eeab184c578cac9bd1d28dc98c6 Mon Sep 17 00:00:00 2001 From: Miroslav Lichvar Date: Mon, 3 Aug 2015 12:02:34 +0200 Subject: [PATCH 103/157] update to 1.32 --- .gitignore | 2 +- libidn.spec | 2 +- sources | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 93a796d..d720956 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ /libidn-1.?? -/libidn-1.31.tar.gz +/libidn-1.32.tar.gz diff --git a/libidn.spec b/libidn.spec index 5ed169b..f5742d5 100644 --- a/libidn.spec +++ b/libidn.spec @@ -1,6 +1,6 @@ Summary: Internationalized Domain Name support library Name: libidn -Version: 1.31 +Version: 1.32 Release: 1%{?dist} URL: http://www.gnu.org/software/libidn/ License: LGPLv2+ and GPLv3+ and GFDL diff --git a/sources b/sources index 09cd7ed..9d99c85 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -83806230fc0989a24cf9dfe6685563d9 libidn-1.31.tar.gz +4dd8356ba577287ea7076bfa1554b534 libidn-1.32.tar.gz From 38cb2572c8f2e8a13bdd51f8570455e66b3f3e81 Mon Sep 17 00:00:00 2001 From: Miroslav Lichvar Date: Mon, 3 Aug 2015 12:20:49 +0200 Subject: [PATCH 104/157] 1.32-1 --- libidn.spec | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libidn.spec b/libidn.spec index f5742d5..c81064f 100644 --- a/libidn.spec +++ b/libidn.spec @@ -150,6 +150,9 @@ fi %license COPYING* java/LICENSE-2.0.txt %changelog +* Mon Aug 03 2015 Miroslav Lichvar - 1.32-1 +- update to 1.32 + * Mon Jul 13 2015 Miroslav Lichvar - 1.31-1 - update to 1.31 (CVE-2015-2059) From d796581dd0bdf8366cc0dbfa7dcef46b580f7156 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Thu, 4 Feb 2016 03:19:56 +0000 Subject: [PATCH 105/157] - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild --- libidn.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libidn.spec b/libidn.spec index c81064f..ff89949 100644 --- a/libidn.spec +++ b/libidn.spec @@ -1,7 +1,7 @@ Summary: Internationalized Domain Name support library Name: libidn Version: 1.32 -Release: 1%{?dist} +Release: 2%{?dist} URL: http://www.gnu.org/software/libidn/ License: LGPLv2+ and GPLv3+ and GFDL Source0: http://ftp.gnu.org/gnu/libidn/libidn-%{version}.tar.gz @@ -150,6 +150,9 @@ fi %license COPYING* java/LICENSE-2.0.txt %changelog +* Thu Feb 04 2016 Fedora Release Engineering - 1.32-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + * Mon Aug 03 2015 Miroslav Lichvar - 1.32-1 - update to 1.32 From 030f782596ae8e7cb1fc89698225e38ac765cc62 Mon Sep 17 00:00:00 2001 From: gil Date: Sat, 18 Jun 2016 23:52:54 +0200 Subject: [PATCH 106/157] rebuilt for re-generate maven depmap --- libidn.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libidn.spec b/libidn.spec index ff89949..ef82387 100644 --- a/libidn.spec +++ b/libidn.spec @@ -1,7 +1,7 @@ Summary: Internationalized Domain Name support library Name: libidn Version: 1.32 -Release: 2%{?dist} +Release: 3%{?dist} URL: http://www.gnu.org/software/libidn/ License: LGPLv2+ and GPLv3+ and GFDL Source0: http://ftp.gnu.org/gnu/libidn/libidn-%{version}.tar.gz @@ -150,6 +150,9 @@ fi %license COPYING* java/LICENSE-2.0.txt %changelog +* Sat Jun 18 2016 gil cattaneo 1.32-3 +- rebuilt for re-generate maven depmap + * Thu Feb 04 2016 Fedora Release Engineering - 1.32-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild From 87244d6036762afa6260a32c8fe69f2db852b519 Mon Sep 17 00:00:00 2001 From: Miroslav Lichvar Date: Thu, 21 Jul 2016 14:08:15 +0200 Subject: [PATCH 107/157] update to 1.33 --- .gitignore | 2 +- libidn.spec | 2 +- sources | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index d720956..d021cba 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ /libidn-1.?? -/libidn-1.32.tar.gz +/libidn-1.33.tar.gz diff --git a/libidn.spec b/libidn.spec index ef82387..0a9cd4b 100644 --- a/libidn.spec +++ b/libidn.spec @@ -1,6 +1,6 @@ Summary: Internationalized Domain Name support library Name: libidn -Version: 1.32 +Version: 1.33 Release: 3%{?dist} URL: http://www.gnu.org/software/libidn/ License: LGPLv2+ and GPLv3+ and GFDL diff --git a/sources b/sources index 9d99c85..7f32215 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -4dd8356ba577287ea7076bfa1554b534 libidn-1.32.tar.gz +a9aa7e003665de9c82bd3f9fc6ccf308 libidn-1.33.tar.gz From 08e4560e83bd66570a960f336402c7afa1236dfd Mon Sep 17 00:00:00 2001 From: Miroslav Lichvar Date: Thu, 21 Jul 2016 14:09:33 +0200 Subject: [PATCH 108/157] 1.33-1 --- libidn.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libidn.spec b/libidn.spec index 0a9cd4b..f1ead6d 100644 --- a/libidn.spec +++ b/libidn.spec @@ -1,7 +1,7 @@ Summary: Internationalized Domain Name support library Name: libidn Version: 1.33 -Release: 3%{?dist} +Release: 1%{?dist} URL: http://www.gnu.org/software/libidn/ License: LGPLv2+ and GPLv3+ and GFDL Source0: http://ftp.gnu.org/gnu/libidn/libidn-%{version}.tar.gz @@ -150,6 +150,9 @@ fi %license COPYING* java/LICENSE-2.0.txt %changelog +* Thu Jul 21 2016 Miroslav Lichvar - 1.33-1 +- update to 1.33 + * Sat Jun 18 2016 gil cattaneo 1.32-3 - rebuilt for re-generate maven depmap From e3d659b901663b2094b56f9879dbe641f3ab65db Mon Sep 17 00:00:00 2001 From: Miroslav Lichvar Date: Fri, 22 Jul 2016 14:38:49 +0200 Subject: [PATCH 109/157] list fixed CVEs in last update --- libidn.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libidn.spec b/libidn.spec index f1ead6d..bf04e88 100644 --- a/libidn.spec +++ b/libidn.spec @@ -151,7 +151,7 @@ fi %changelog * Thu Jul 21 2016 Miroslav Lichvar - 1.33-1 -- update to 1.33 +- update to 1.33 (CVE-2015-8948 CVE-2016-6261 CVE-2016-6262 CVE-2016-6263) * Sat Jun 18 2016 gil cattaneo 1.32-3 - rebuilt for re-generate maven depmap From 7275bd926ff5ecf7ed8eb2af5601ef6953a78352 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 10 Feb 2017 18:50:03 +0000 Subject: [PATCH 110/157] - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild --- libidn.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libidn.spec b/libidn.spec index bf04e88..c2e2d89 100644 --- a/libidn.spec +++ b/libidn.spec @@ -1,7 +1,7 @@ Summary: Internationalized Domain Name support library Name: libidn Version: 1.33 -Release: 1%{?dist} +Release: 2%{?dist} URL: http://www.gnu.org/software/libidn/ License: LGPLv2+ and GPLv3+ and GFDL Source0: http://ftp.gnu.org/gnu/libidn/libidn-%{version}.tar.gz @@ -150,6 +150,9 @@ fi %license COPYING* java/LICENSE-2.0.txt %changelog +* Fri Feb 10 2017 Fedora Release Engineering - 1.33-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + * Thu Jul 21 2016 Miroslav Lichvar - 1.33-1 - update to 1.33 (CVE-2015-8948 CVE-2016-6261 CVE-2016-6262 CVE-2016-6263) From 5cf8b96298284f853b01ab25abf5b64ea983acbe Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 26 Jul 2017 19:02:30 +0000 Subject: [PATCH 111/157] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild --- libidn.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libidn.spec b/libidn.spec index c2e2d89..e65b5c8 100644 --- a/libidn.spec +++ b/libidn.spec @@ -1,7 +1,7 @@ Summary: Internationalized Domain Name support library Name: libidn Version: 1.33 -Release: 2%{?dist} +Release: 3%{?dist} URL: http://www.gnu.org/software/libidn/ License: LGPLv2+ and GPLv3+ and GFDL Source0: http://ftp.gnu.org/gnu/libidn/libidn-%{version}.tar.gz @@ -150,6 +150,9 @@ fi %license COPYING* java/LICENSE-2.0.txt %changelog +* Wed Jul 26 2017 Fedora Release Engineering - 1.33-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + * Fri Feb 10 2017 Fedora Release Engineering - 1.33-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild From c9b896cc7d2298be00e20e08728b7e9d41effc7d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 3 Aug 2017 01:38:37 +0000 Subject: [PATCH 112/157] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild --- libidn.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libidn.spec b/libidn.spec index e65b5c8..f10c86e 100644 --- a/libidn.spec +++ b/libidn.spec @@ -1,7 +1,7 @@ Summary: Internationalized Domain Name support library Name: libidn Version: 1.33 -Release: 3%{?dist} +Release: 4%{?dist} URL: http://www.gnu.org/software/libidn/ License: LGPLv2+ and GPLv3+ and GFDL Source0: http://ftp.gnu.org/gnu/libidn/libidn-%{version}.tar.gz @@ -150,6 +150,9 @@ fi %license COPYING* java/LICENSE-2.0.txt %changelog +* Thu Aug 03 2017 Fedora Release Engineering - 1.33-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + * Wed Jul 26 2017 Fedora Release Engineering - 1.33-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild From 372636f0056121bc542824e5e7edb7294f3894a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= Date: Mon, 2 Oct 2017 15:00:28 +0200 Subject: [PATCH 113/157] Add build-conditions disabling Emacs and Java support These macros allows to build libidn package without Emacs or Java support and that is handy when building libidn for modular Fedora when these dependencies are not necessary. By default the package is built with all features enabled. --- ...n-1.33-Allow-disabling-Emacs-support.patch | 61 +++++++++++++++++++ libidn.spec | 52 +++++++++++++++- 2 files changed, 110 insertions(+), 3 deletions(-) create mode 100644 libidn-1.33-Allow-disabling-Emacs-support.patch diff --git a/libidn-1.33-Allow-disabling-Emacs-support.patch b/libidn-1.33-Allow-disabling-Emacs-support.patch new file mode 100644 index 0000000..2c7189b --- /dev/null +++ b/libidn-1.33-Allow-disabling-Emacs-support.patch @@ -0,0 +1,61 @@ +From d011a6ae00ce9abd445d6d01ce9131a7b97ef5bc Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= +Date: Tue, 3 Oct 2017 10:04:18 +0200 +Subject: [PATCH] Allow disabling Emacs support +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +This patch adds --disable-emacs configure option to disable installing +LISP scripts for Emacs. + +Signed-off-by: Petr Písař +--- + configure.ac | 9 ++++++++- + src/Makefile.am | 2 ++ + 2 files changed, 10 insertions(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 649ddcd..a6dc9ff 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -50,7 +50,6 @@ AM_MISSING_PROG(HELP2MAN, help2man, $missing_dir) + AM_GNU_GETTEXT(external) + AM_GNU_GETTEXT_VERSION(0.19.3) + AM_ICONV +-AM_PATH_LISPDIR + + if test "$am_cv_func_iconv" != "yes"; then + AC_MSG_NOTICE([ +@@ -100,6 +99,14 @@ AM_CONDITIONAL(JAVA, test "$enable_java" != "no") + AC_MSG_CHECKING([if implementation in Java should be built]) + AC_MSG_RESULT($enable_java) + ++# Check for Emacs ++AC_ARG_ENABLE(emacs, AC_HELP_STRING([--disable-emacs], [disable Emacs support]), ++ enable_emacs=$enableval, enable_emacs=yes) ++AM_CONDITIONAL(EMACS, test "$enable_emacs" != "no") ++if test "$enable_emacs" != "no"; then ++ AM_PATH_LISPDIR ++fi ++ + # Check for C# + if test -n "$HAVE_CSHARPCOMP"; then + gt_CSHARPEXEC +diff --git a/src/Makefile.am b/src/Makefile.am +index 6832c20..ec99560 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -20,7 +20,9 @@ AM_CFLAGS = $(WERROR_CFLAGS) $(WARN_CFLAGS) + AM_CPPFLAGS = -I$(top_srcdir)/lib -I../lib -I$(top_srcdir)/gl -I../gl + AM_CPPFLAGS += -DLOCALEDIR=\"$(localedir)\" + ++if EMACS + dist_lisp_DATA = punycode.el idna.el ++endif + + bin_PROGRAMS = idn + idn_SOURCES = idn.c +-- +2.13.6 + diff --git a/libidn.spec b/libidn.spec index f10c86e..df2d034 100644 --- a/libidn.spec +++ b/libidn.spec @@ -1,3 +1,8 @@ +# Build with Emacs support +%bcond_without libidn_enables_emacs +# Build with Java support +%bcond_without libidn_enables_java + Summary: Internationalized Domain Name support library Name: libidn Version: 1.33 @@ -5,17 +10,27 @@ Release: 4%{?dist} URL: http://www.gnu.org/software/libidn/ License: LGPLv2+ and GPLv3+ and GFDL Source0: http://ftp.gnu.org/gnu/libidn/libidn-%{version}.tar.gz +# Allow disabling Emacs support +Patch0: libidn-1.33-Allow-disabling-Emacs-support.patch Group: System Environment/Libraries -BuildRequires: pkgconfig gettext emacs +BuildRequires: autoconf +BuildRequires: automake +BuildRequires: gettext-devel +%if %{with libidn_enables_emacs} +BuildRequires: emacs +%endif +BuildRequires: pkgconfig gettext Requires(post): /sbin/install-info /sbin/ldconfig Requires(preun): /sbin/install-info Requires(postun): /sbin/ldconfig # gnulib is a copylib, bundling is allowed Provides: bundled(gnulib) +%if %{with libidn_enables_emacs} # emacs-libidn merged with main package in 1.30-4 Obsoletes: emacs-libidn < 1.30-4 Provides: emacs-libidn < 1.30-4 Requires: emacs-filesystem >= %{_emacs_version} +%endif %description GNU Libidn is an implementation of the Stringprep, Punycode and @@ -33,6 +48,7 @@ Requires: pkgconfig This package includes header files and libraries necessary for developing programs which use the GNU libidn library. +%if %{with libidn_enables_java} %package java Summary: Java port of the GNU Libidn library BuildRequires: java-devel @@ -55,16 +71,23 @@ BuildArch: noarch %description javadoc This package contains javadoc for %{name}-java. +%endif %prep %setup -q +%patch0 -p1 +autoreconf -fi +# Prevent from regenerating sources by gengetopt because it's broken. +touch src/idn_cmd.c src/idn_cmd.h # Cleanup find . -name '*.jar' -print -delete find . -name '*.class' -print -delete +%if %{with libidn_enables_java} # Not available test dep %pom_remove_dep com.google.caliper:caliper java/pom.xml.in +%endif # Name directory sections consistently in the info file, #209491 sed -i '/^INFO-DIR-SECTION/{s/GNU Libraries/Libraries/;s/GNU utilities/Utilities/;}' doc/libidn.info @@ -73,7 +96,18 @@ iconv -f ISO-8859-1 -t UTF-8 doc/libidn.info > iconv.tmp mv iconv.tmp doc/libidn.info %build -%configure --disable-csharp --disable-static --with-lispdir=%{_emacs_sitelispdir}/%{name} --enable-java +%configure --disable-csharp --disable-static \ +%if %{with libidn_enables_emacs} + --enable-emacs \ + --with-lispdir=%{_emacs_sitelispdir}/%{name} \ +%else + --disable-emacs \ +%endif +%if %{with libidn_enables_java} + --enable-java +%else + --disable-java +%endif # remove RPATH hardcoding sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool @@ -87,7 +121,11 @@ export LD_LIBRARY_PATH=$(pwd)/lib/.libs make %{?_smp_mflags} -C tests check VALGRIND=env %install -make install DESTDIR=$RPM_BUILD_ROOT pkgconfigdir=%{_libdir}/pkgconfig libidn_jardir=%{_javadir} +make install DESTDIR=$RPM_BUILD_ROOT pkgconfigdir=%{_libdir}/pkgconfig \ +%if %{with libidn_enables_java} + libidn_jardir=%{_javadir} \ +%endif + ; # provide more examples make %{?_smp_mflags} -C examples distclean @@ -102,8 +140,11 @@ sed -i '/gnu compiler/d' $RPM_BUILD_ROOT%{_includedir}/idn-int.h rm -f $RPM_BUILD_ROOT%{_libdir}/*.la \ $RPM_BUILD_ROOT%{_datadir}/info/*.png +%if %{with libidn_enables_emacs} %{_emacs_bytecompile} $RPM_BUILD_ROOT%{_emacs_sitelispdir}/%{name}/*.el +%endif +%if %{with libidn_enables_java} # regenerate java documentation rm -rf doc/java/* %javadoc -source 1.6 -d doc/java $(find java/src/main/java -name "*.java") @@ -112,6 +153,7 @@ rm -rf $RPM_BUILD_ROOT%{_javadir}/libidn*.jar %mvn_artifact java/pom.xml java/libidn-%{version}.jar %mvn_file org.gnu.inet:libidn libidn %mvn_install -J doc/java +%endif %find_lang %{name} @@ -134,7 +176,9 @@ fi %{_mandir}/man1/idn.1* %{_libdir}/libidn.so.* %{_infodir}/%{name}.info.gz +%if %{with libidn_enables_emacs} %{_emacs_sitelispdir}/%{name} +%endif %files devel %doc doc/libidn.html examples @@ -143,11 +187,13 @@ fi %{_libdir}/pkgconfig/*.pc %{_mandir}/man3/* +%if %{with libidn_enables_java} %files java -f .mfiles %license COPYING* java/LICENSE-2.0.txt %files javadoc -f .mfiles-javadoc %license COPYING* java/LICENSE-2.0.txt +%endif %changelog * Thu Aug 03 2017 Fedora Release Engineering - 1.33-4 From 5bccab96dc929ec32d7d182a5024cea0bb1016b6 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 7 Feb 2018 21:55:38 +0000 Subject: [PATCH 114/157] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- libidn.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libidn.spec b/libidn.spec index df2d034..f820d77 100644 --- a/libidn.spec +++ b/libidn.spec @@ -6,7 +6,7 @@ Summary: Internationalized Domain Name support library Name: libidn Version: 1.33 -Release: 4%{?dist} +Release: 5%{?dist} URL: http://www.gnu.org/software/libidn/ License: LGPLv2+ and GPLv3+ and GFDL Source0: http://ftp.gnu.org/gnu/libidn/libidn-%{version}.tar.gz @@ -196,6 +196,9 @@ fi %endif %changelog +* Wed Feb 07 2018 Fedora Release Engineering - 1.33-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Thu Aug 03 2017 Fedora Release Engineering - 1.33-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild From a23865661f0447ee0135f6b46093be5fcf82922c Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Wed, 21 Feb 2018 00:10:01 +0000 Subject: [PATCH 115/157] Add missing libtool dep, minor cleanups --- libidn.spec | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/libidn.spec b/libidn.spec index f820d77..657cdfa 100644 --- a/libidn.spec +++ b/libidn.spec @@ -6,20 +6,21 @@ Summary: Internationalized Domain Name support library Name: libidn Version: 1.33 -Release: 5%{?dist} +Release: 6%{?dist} URL: http://www.gnu.org/software/libidn/ License: LGPLv2+ and GPLv3+ and GFDL Source0: http://ftp.gnu.org/gnu/libidn/libidn-%{version}.tar.gz # Allow disabling Emacs support Patch0: libidn-1.33-Allow-disabling-Emacs-support.patch -Group: System Environment/Libraries + BuildRequires: autoconf BuildRequires: automake -BuildRequires: gettext-devel +BuildRequires: libtool +BuildRequires: gettext gettext-devel %if %{with libidn_enables_emacs} BuildRequires: emacs %endif -BuildRequires: pkgconfig gettext +BuildRequires: pkgconfig Requires(post): /sbin/install-info /sbin/ldconfig Requires(preun): /sbin/install-info Requires(postun): /sbin/ldconfig @@ -40,7 +41,6 @@ names. %package devel Summary: Development files for the libidn library -Group: Development/Libraries Requires: %{name}%{?_isa} = %{version}-%{release} Requires: pkgconfig @@ -76,7 +76,7 @@ This package contains javadoc for %{name}-java. %prep %setup -q %patch0 -p1 -autoreconf -fi +autoreconf -vif # Prevent from regenerating sources by gengetopt because it's broken. touch src/idn_cmd.c src/idn_cmd.h @@ -196,6 +196,9 @@ fi %endif %changelog +* Tue Feb 20 2018 Peter Robinson 1.33-6 +- Add missing libtool dep, minor cleanups + * Wed Feb 07 2018 Fedora Release Engineering - 1.33-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild From b189f1386f2d1f253656b63c0248d9e72637c840 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Wed, 21 Feb 2018 00:21:55 +0000 Subject: [PATCH 116/157] add missing help2man dep --- libidn.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/libidn.spec b/libidn.spec index 657cdfa..a30f97a 100644 --- a/libidn.spec +++ b/libidn.spec @@ -21,6 +21,7 @@ BuildRequires: gettext gettext-devel BuildRequires: emacs %endif BuildRequires: pkgconfig +BuildRequires: help2man Requires(post): /sbin/install-info /sbin/ldconfig Requires(preun): /sbin/install-info Requires(postun): /sbin/ldconfig From 3220c325e908181ffce9e7b4399ede6ef234c550 Mon Sep 17 00:00:00 2001 From: Miroslav Lichvar Date: Wed, 4 Apr 2018 14:00:00 +0200 Subject: [PATCH 117/157] update to 1.34 (CVE-2017-14062) --- .gitignore | 2 +- libidn.spec | 2 +- sources | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index d021cba..213427b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ /libidn-1.?? -/libidn-1.33.tar.gz +/libidn-1.34.tar.gz diff --git a/libidn.spec b/libidn.spec index a30f97a..f791503 100644 --- a/libidn.spec +++ b/libidn.spec @@ -5,7 +5,7 @@ Summary: Internationalized Domain Name support library Name: libidn -Version: 1.33 +Version: 1.34 Release: 6%{?dist} URL: http://www.gnu.org/software/libidn/ License: LGPLv2+ and GPLv3+ and GFDL diff --git a/sources b/sources index 7f32215..cde9308 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a9aa7e003665de9c82bd3f9fc6ccf308 libidn-1.33.tar.gz +SHA512 (libidn-1.34.tar.gz) = 1a9b5f2554d3953591b92010fa0fdedc438ca8bc31d2bc06c621eb5d423e81656607f09ac75bb02e1a5420459f69e82b5fb82987afa50db69793f9cd7a08365a From 5531405c3c5df5b76a215e1a40b678e7a2e65422 Mon Sep 17 00:00:00 2001 From: Miroslav Lichvar Date: Wed, 4 Apr 2018 14:06:44 +0200 Subject: [PATCH 118/157] include soname in file list --- libidn.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libidn.spec b/libidn.spec index f791503..04d62ee 100644 --- a/libidn.spec +++ b/libidn.spec @@ -175,7 +175,7 @@ fi %doc AUTHORS NEWS FAQ README THANKS %{_bindir}/idn %{_mandir}/man1/idn.1* -%{_libdir}/libidn.so.* +%{_libdir}/libidn.so.11* %{_infodir}/%{name}.info.gz %if %{with libidn_enables_emacs} %{_emacs_sitelispdir}/%{name} From 6dcb601b725a67a197f8d520609452ff6cbe9a52 Mon Sep 17 00:00:00 2001 From: Miroslav Lichvar Date: Wed, 4 Apr 2018 14:10:49 +0200 Subject: [PATCH 119/157] use macros for ldconfig --- libidn.spec | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/libidn.spec b/libidn.spec index 04d62ee..6104874 100644 --- a/libidn.spec +++ b/libidn.spec @@ -22,9 +22,8 @@ BuildRequires: emacs %endif BuildRequires: pkgconfig BuildRequires: help2man -Requires(post): /sbin/install-info /sbin/ldconfig +Requires(post): /sbin/install-info Requires(preun): /sbin/install-info -Requires(postun): /sbin/ldconfig # gnulib is a copylib, bundling is allowed Provides: bundled(gnulib) %if %{with libidn_enables_emacs} @@ -160,14 +159,14 @@ rm -rf $RPM_BUILD_ROOT%{_javadir}/libidn*.jar %post /sbin/install-info %{_infodir}/%{name}.info.gz %{_infodir}/dir -/sbin/ldconfig +%?ldconfig %preun if [ $1 = 0 ]; then /sbin/install-info --delete %{_infodir}/%{name}.info.gz %{_infodir}/dir || : fi -%postun -p /sbin/ldconfig +%ldconfig_postun %files -f %{name}.lang %{!?_licensedir:%global license %%doc} From 48bc9d740c42380972469198357e6f8d99080f67 Mon Sep 17 00:00:00 2001 From: Miroslav Lichvar Date: Wed, 4 Apr 2018 14:11:26 +0200 Subject: [PATCH 120/157] add gcc to build requirements --- libidn.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/libidn.spec b/libidn.spec index 6104874..25ce530 100644 --- a/libidn.spec +++ b/libidn.spec @@ -16,6 +16,7 @@ Patch0: libidn-1.33-Allow-disabling-Emacs-support.patch BuildRequires: autoconf BuildRequires: automake BuildRequires: libtool +BuildRequires: gcc BuildRequires: gettext gettext-devel %if %{with libidn_enables_emacs} BuildRequires: emacs From d9e83847cb66b9ff167238a9d3c0b23d166330d9 Mon Sep 17 00:00:00 2001 From: Miroslav Lichvar Date: Wed, 4 Apr 2018 14:17:34 +0200 Subject: [PATCH 121/157] 1.34-1 --- libidn.spec | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/libidn.spec b/libidn.spec index 25ce530..2da2b89 100644 --- a/libidn.spec +++ b/libidn.spec @@ -6,7 +6,7 @@ Summary: Internationalized Domain Name support library Name: libidn Version: 1.34 -Release: 6%{?dist} +Release: 1%{?dist} URL: http://www.gnu.org/software/libidn/ License: LGPLv2+ and GPLv3+ and GFDL Source0: http://ftp.gnu.org/gnu/libidn/libidn-%{version}.tar.gz @@ -197,6 +197,12 @@ fi %endif %changelog +* Wed Apr 04 2018 Miroslav Lichvar - 1.34-1 +- update to 1.34 (CVE-2017-14062) +- include soname in file list +- use macros for ldconfig +- add gcc to build requirements + * Tue Feb 20 2018 Peter Robinson 1.33-6 - Add missing libtool dep, minor cleanups From eccb1b3a41cab3ea9f334e9d55106cf7a4ba96a8 Mon Sep 17 00:00:00 2001 From: Miroslav Lichvar Date: Fri, 4 May 2018 13:05:43 +0200 Subject: [PATCH 122/157] fix ABI compatibility with libidn-1.33 and earlier (#1566414 #1573961) --- libidn-tablesize-revert.patch | 758 ++++++++++++++++++++++++++++++++++ libidn.spec | 3 + 2 files changed, 761 insertions(+) create mode 100644 libidn-tablesize-revert.patch diff --git a/libidn-tablesize-revert.patch b/libidn-tablesize-revert.patch new file mode 100644 index 0000000..13bf2b3 --- /dev/null +++ b/libidn-tablesize-revert.patch @@ -0,0 +1,758 @@ +This is a revert of + +commit 518b72c7273278d24cb79ac1485972e42cf98ed4 +Author: Tim Rühsen +Date: Thu Jun 29 12:52:57 2017 +0200 + + Increase speed of stringprep by ~20x + +diff -up libidn-1.34/lib/Makefile.am.tablesize-revert libidn-1.34/lib/Makefile.am +--- libidn-1.34/lib/Makefile.am.tablesize-revert 2017-07-14 20:18:42.000000000 +0200 ++++ libidn-1.34/lib/Makefile.am 2018-05-04 12:45:38.293778700 +0200 +@@ -28,7 +28,7 @@ lib_LTLIBRARIES = libidn.la + + idn_int = idn-int.h + +-BUILT_SOURCES = $(idn_int) gunibreak.h gunicomp.h gunidecomp.h rfc3454.c rfc3454.h tlds.c ++BUILT_SOURCES = $(idn_int) gunibreak.h gunicomp.h gunidecomp.h rfc3454.c tlds.c + DISTCLEANFILES = $(idn_int) + include_HEADERS = stringprep.h idna.h punycode.h idn-free.h pr29.h + if TLD +@@ -46,7 +46,7 @@ idn-int.h: + libidn_la_SOURCES = libidn.map \ + gunibreak.h gunicomp.h gunidecomp.h \ + nfkc.c toutf8.c version.c \ +- stringprep.h stringprep.c rfc3454.c rfc3454.h profiles.c \ ++ stringprep.h stringprep.c rfc3454.c profiles.c \ + punycode.h punycode.c \ + idna.h idna.c \ + pr29.h pr29.c \ +@@ -82,7 +82,7 @@ SPEC = $(top_srcdir)/doc/specifications + #gunibreak.h gunicomp.h gunidecomp.h: gen-unicode-tables.pl $(SPEC)/UnicodeData-3.2.0.txt $(SPEC)/LineBreak-3.2.0.txt $(SPEC)/SpecialCasing-3.2.0.txt $(SPEC)/CaseFolding-3.2.0.txt $(SPEC)/CompositionExclusions-3.2.0.txt + # $(PERL) $(srcdir)/gen-unicode-tables.pl -decomp 3.2 $(SPEC) + +-rfc3454.c rfc3454.h: gen-stringprep-tables.pl ++rfc3454.c: gen-stringprep-tables.pl + $(PERL) $(srcdir)/gen-stringprep-tables.pl $(SPEC)/rfc3454.txt + + tlds.c: gen-tld-tables.pl +diff -up libidn-1.34/lib/gen-stringprep-tables.pl.tablesize-revert libidn-1.34/lib/gen-stringprep-tables.pl +--- libidn-1.34/lib/gen-stringprep-tables.pl.tablesize-revert 2017-06-29 21:11:13.000000000 +0200 ++++ libidn-1.34/lib/gen-stringprep-tables.pl 2018-05-04 12:44:24.696588209 +0200 +@@ -22,13 +22,11 @@ use strict; + + my ($tab) = 59; + my ($intable) = 0; +-my ($entries) = 0; + my ($tablename); + my ($varname); + my ($starheader, $header); + my ($profile) = "rfc3454"; + my ($filename) = "$profile.c"; +-my ($headername) = "$profile.h"; + my ($line, $start, $end, @map); + + open(FH, ">$filename") or die "cannot open $filename for writing"; +@@ -39,10 +37,6 @@ print FH " Instead, edit gen-stringpre + print FH "#include \n"; + print FH "#include \"stringprep.h\"\n"; + +-open(FHH, ">$headername") or die "cannot open $headername for writing"; +-print FHH "/* This file is automatically generated. DO NOT EDIT!\n"; +-print FHH " Instead, edit gen-stringprep-tables.pl and re-run. */\n\n"; +- + while(<>) { + s/^ (.*)/$1/g; # for rfc + $line = $_; +@@ -53,11 +47,9 @@ while(<>) { + if ($intable && m,^----- End Table (.*) -----,) { + die "table error" unless $1 eq $tablename || + ($1 eq "C.1.2" && $tablename eq "C.1.1"); # Typo in draft ++ $intable = 0; + print FH " { 0 },\n"; + print FH "};\n\n"; +- print FHH "#define N_STRINGPREP_${profile}_${varname} ${entries}\n"; +- $intable = 0; +- $entries = 0; + } + + if (m,^[A-Z],) { +@@ -92,28 +84,27 @@ while(<>) { + die "tables tried to map a range" if $end && $map[0]; + + if ($map[3]) { +- printf FH " { 0x%06s, 0x%06s, { 0x%06s,%*s/* %s */\n 0x%06s, 0x%06s, 0x%06s }},\n", +- $start, $start, $map[0], $tab-length($line)-13, " ", $line, ++ printf FH " { 0x%06s, 0, { 0x%06s,%*s/* %s */\n 0x%06s, 0x%06s, 0x%06s }},\n", ++ $start, $map[0], $tab-length($line)-13, " ", $line, + $map[1], $map[2], $map[3]; + } elsif ($map[2]) { +- printf FH " { 0x%06s, 0x%06s, { 0x%06s,%*s/* %s */\n 0x%06s, 0x%06s }},\n", +- $start, $start, $map[0], $tab-length($line)-14, " ", $line, ++ printf FH " { 0x%06s, 0, { 0x%06s,%*s/* %s */\n 0x%06s, 0x%06s }},\n", ++ $start, $map[0], $tab-length($line)-14, " ", $line, + $map[1], $map[2]; + } elsif ($map[1]) { +- printf FH " { 0x%06s, 0x%06s, { 0x%06s,%*s/* %s */\n 0x%06s }},\n", +- $start, $start, $map[0], $tab-length($line)-14, " ", $line, ++ printf FH " { 0x%06s, 0, { 0x%06s,%*s/* %s */\n 0x%06s }},\n", ++ $start, $map[0], $tab-length($line)-14, " ", $line, + $map[1]; + } elsif ($map[0]) { +- printf FH " { 0x%06s, 0x%06s, { 0x%06s }},%*s/* %s */\n", +- $start, $start, $map[0], $tab-length($line)-17, " ", $line; ++ printf FH " { 0x%06s, 0, { 0x%06s }},%*s/* %s */\n", ++ $start, $map[0], $tab-length($line)-17, " ", $line; + } elsif ($end) { + printf FH " { 0x%06s, 0x%06s },%*s/* %s */\n", + $start, $end, $tab-length($line)-11, " ", $line; + } else { +- printf FH " { 0x%06s, 0x%06s },%*s/* %s */\n", +- $start, $start, $tab-length($line)-11, " ", $line; ++ printf FH " { 0x%06s },%*s/* %s */\n", ++ $start, $tab-length($line)-11, " ", $line; + } +- $entries++; + } else { + $intable = 1 if !$intable; + $tablename = $1; +@@ -126,5 +117,4 @@ while(<>) { + } + } + +-close FHH or die "cannot close $headername"; + close FH or die "cannot close $filename"; +diff -up libidn-1.34/lib/profiles.c.tablesize-revert libidn-1.34/lib/profiles.c +--- libidn-1.34/lib/profiles.c.tablesize-revert 2017-06-29 21:11:13.000000000 +0200 ++++ libidn-1.34/lib/profiles.c 2018-05-04 12:44:24.696588209 +0200 +@@ -29,7 +29,6 @@ + + #include + #include "stringprep.h" +-#include "rfc3454.h" + + const Stringprep_profiles stringprep_profiles[] = { + {"Nameprep", stringprep_nameprep}, +@@ -44,219 +43,280 @@ const Stringprep_profiles stringprep_pro + {NULL, NULL} + }; + +-/* number of elements within an array */ +-#define countof(a) (sizeof(a)/sizeof(*(a))) +- +-/* helper for profile definitions */ +-#define TABLE(x) stringprep_rfc3454_##x, N_STRINGPREP_rfc3454_##x +- + const Stringprep_profile stringprep_nameprep[] = { +- {STRINGPREP_MAP_TABLE, 0, TABLE(B_1)}, +- {STRINGPREP_MAP_TABLE, 0, TABLE(B_2)}, +- {STRINGPREP_NFKC, 0, 0, 0}, +- {STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_1_2)}, +- {STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_2_2)}, +- {STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_3)}, +- {STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_4)}, +- {STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_5)}, +- {STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_6)}, +- {STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_7)}, +- {STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_8)}, +- {STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_9)}, +- {STRINGPREP_BIDI, 0, 0, 0}, +- {STRINGPREP_BIDI_PROHIBIT_TABLE, ~STRINGPREP_NO_BIDI, TABLE(C_8)}, +- {STRINGPREP_BIDI_RAL_TABLE, 0, TABLE(D_1)}, +- {STRINGPREP_BIDI_L_TABLE, 0, TABLE(D_2)}, +- {STRINGPREP_UNASSIGNED_TABLE, ~STRINGPREP_NO_UNASSIGNED, TABLE(A_1)}, ++ {STRINGPREP_MAP_TABLE, 0, stringprep_rfc3454_B_1}, ++ {STRINGPREP_MAP_TABLE, 0, stringprep_rfc3454_B_2}, ++ {STRINGPREP_NFKC, 0, 0}, ++ {STRINGPREP_PROHIBIT_TABLE, 0, stringprep_rfc3454_C_1_2}, ++ {STRINGPREP_PROHIBIT_TABLE, 0, stringprep_rfc3454_C_2_2}, ++ {STRINGPREP_PROHIBIT_TABLE, 0, stringprep_rfc3454_C_3}, ++ {STRINGPREP_PROHIBIT_TABLE, 0, stringprep_rfc3454_C_4}, ++ {STRINGPREP_PROHIBIT_TABLE, 0, stringprep_rfc3454_C_5}, ++ {STRINGPREP_PROHIBIT_TABLE, 0, stringprep_rfc3454_C_6}, ++ {STRINGPREP_PROHIBIT_TABLE, 0, stringprep_rfc3454_C_7}, ++ {STRINGPREP_PROHIBIT_TABLE, 0, stringprep_rfc3454_C_8}, ++ {STRINGPREP_PROHIBIT_TABLE, 0, stringprep_rfc3454_C_9}, ++ {STRINGPREP_BIDI, 0, 0}, ++ {STRINGPREP_BIDI_PROHIBIT_TABLE, ~STRINGPREP_NO_BIDI, ++ stringprep_rfc3454_C_8}, ++ {STRINGPREP_BIDI_RAL_TABLE, 0, stringprep_rfc3454_D_1}, ++ {STRINGPREP_BIDI_L_TABLE, 0, stringprep_rfc3454_D_2}, ++ {STRINGPREP_UNASSIGNED_TABLE, ~STRINGPREP_NO_UNASSIGNED, ++ stringprep_rfc3454_A_1}, + {0} + }; + + const Stringprep_profile stringprep_kerberos5[] = { + /* XXX this is likely to be wrong as the specification is + a rough draft. */ +- {STRINGPREP_MAP_TABLE, 0, TABLE(B_1)}, +- {STRINGPREP_MAP_TABLE, 0, TABLE(B_3)}, +- {STRINGPREP_NFKC, 0, 0, 0}, +- {STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_1_2)}, +- {STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_2_2)}, +- {STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_3)}, +- {STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_4)}, +- {STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_5)}, +- {STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_6)}, +- {STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_7)}, +- {STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_8)}, +- {STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_9)}, +- {STRINGPREP_BIDI, 0, 0, 0}, +- {STRINGPREP_BIDI_PROHIBIT_TABLE, ~STRINGPREP_NO_BIDI, TABLE(C_8)}, +- {STRINGPREP_BIDI_RAL_TABLE, 0, TABLE(D_1)}, +- {STRINGPREP_BIDI_L_TABLE, 0, TABLE(D_2)}, +- {STRINGPREP_UNASSIGNED_TABLE, ~STRINGPREP_NO_UNASSIGNED, TABLE(A_1)}, ++ {STRINGPREP_MAP_TABLE, 0, stringprep_rfc3454_B_1}, ++ {STRINGPREP_MAP_TABLE, 0, stringprep_rfc3454_B_3}, ++ {STRINGPREP_NFKC, 0, 0}, ++ {STRINGPREP_PROHIBIT_TABLE, 0, stringprep_rfc3454_C_1_2}, ++ {STRINGPREP_PROHIBIT_TABLE, 0, stringprep_rfc3454_C_2_2}, ++ {STRINGPREP_PROHIBIT_TABLE, 0, stringprep_rfc3454_C_3}, ++ {STRINGPREP_PROHIBIT_TABLE, 0, stringprep_rfc3454_C_4}, ++ {STRINGPREP_PROHIBIT_TABLE, 0, stringprep_rfc3454_C_5}, ++ {STRINGPREP_PROHIBIT_TABLE, 0, stringprep_rfc3454_C_6}, ++ {STRINGPREP_PROHIBIT_TABLE, 0, stringprep_rfc3454_C_7}, ++ {STRINGPREP_PROHIBIT_TABLE, 0, stringprep_rfc3454_C_8}, ++ {STRINGPREP_PROHIBIT_TABLE, 0, stringprep_rfc3454_C_9}, ++ {STRINGPREP_BIDI, 0, 0}, ++ {STRINGPREP_BIDI_PROHIBIT_TABLE, ~STRINGPREP_NO_BIDI, ++ stringprep_rfc3454_C_8}, ++ {STRINGPREP_BIDI_RAL_TABLE, 0, stringprep_rfc3454_D_1}, ++ {STRINGPREP_BIDI_L_TABLE, 0, stringprep_rfc3454_D_2}, ++ {STRINGPREP_UNASSIGNED_TABLE, ~STRINGPREP_NO_UNASSIGNED, ++ stringprep_rfc3454_A_1}, + {0} + }; + + const Stringprep_table_element stringprep_xmpp_nodeprep_prohibit[] = { +- {0x000022, 0x000022}, /* #x22 (") */ +- {0x000026, 0x000026}, /* #x26 (&) */ +- {0x000027, 0x000027}, /* #x27 (') */ +- {0x00002F, 0x00002F}, /* #x2F (/) */ +- {0x00003A, 0x00003A}, /* #x3A (:) */ +- {0x00003C, 0x00003C}, /* #x3C (<) */ +- {0x00003E, 0x00003E}, /* #x3E (>) */ +- {0x000040, 0x000040}, /* #x40 (@) */ ++ {0x000022}, /* #x22 (") */ ++ {0x000026}, /* #x26 (&) */ ++ {0x000027}, /* #x27 (') */ ++ {0x00002F}, /* #x2F (/) */ ++ {0x00003A}, /* #x3A (:) */ ++ {0x00003C}, /* #x3C (<) */ ++ {0x00003E}, /* #x3E (>) */ ++ {0x000040}, /* #x40 (@) */ + {0} + }; + + const Stringprep_profile stringprep_xmpp_nodeprep[] = { +- {STRINGPREP_MAP_TABLE, 0, TABLE(B_1)}, +- {STRINGPREP_MAP_TABLE, 0, TABLE(B_2)}, +- {STRINGPREP_NFKC, 0, 0, 0}, +- {STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_1_1)}, +- {STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_1_2)}, +- {STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_2_1)}, +- {STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_2_2)}, +- {STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_3)}, +- {STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_4)}, +- {STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_5)}, +- {STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_6)}, +- {STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_7)}, +- {STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_8)}, +- {STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_9)}, +- {STRINGPREP_PROHIBIT_TABLE, 0, stringprep_xmpp_nodeprep_prohibit, +- countof(stringprep_xmpp_nodeprep_prohibit) - 1}, +- {STRINGPREP_BIDI, 0, 0, 0}, +- {STRINGPREP_BIDI_PROHIBIT_TABLE, 0, TABLE(C_8)}, +- {STRINGPREP_BIDI_RAL_TABLE, 0, TABLE(D_1)}, +- {STRINGPREP_BIDI_L_TABLE, 0, TABLE(D_2)}, +- {STRINGPREP_UNASSIGNED_TABLE, ~STRINGPREP_NO_UNASSIGNED, TABLE(A_1)}, ++ {STRINGPREP_MAP_TABLE, 0, stringprep_rfc3454_B_1}, ++ {STRINGPREP_MAP_TABLE, 0, stringprep_rfc3454_B_2}, ++ {STRINGPREP_NFKC, 0, 0}, ++ {STRINGPREP_PROHIBIT_TABLE, 0, stringprep_rfc3454_C_1_1}, ++ {STRINGPREP_PROHIBIT_TABLE, 0, stringprep_rfc3454_C_1_2}, ++ {STRINGPREP_PROHIBIT_TABLE, 0, stringprep_rfc3454_C_2_1}, ++ {STRINGPREP_PROHIBIT_TABLE, 0, stringprep_rfc3454_C_2_2}, ++ {STRINGPREP_PROHIBIT_TABLE, 0, stringprep_rfc3454_C_3}, ++ {STRINGPREP_PROHIBIT_TABLE, 0, stringprep_rfc3454_C_4}, ++ {STRINGPREP_PROHIBIT_TABLE, 0, stringprep_rfc3454_C_5}, ++ {STRINGPREP_PROHIBIT_TABLE, 0, stringprep_rfc3454_C_6}, ++ {STRINGPREP_PROHIBIT_TABLE, 0, stringprep_rfc3454_C_7}, ++ {STRINGPREP_PROHIBIT_TABLE, 0, stringprep_rfc3454_C_8}, ++ {STRINGPREP_PROHIBIT_TABLE, 0, stringprep_rfc3454_C_9}, ++ {STRINGPREP_PROHIBIT_TABLE, 0, stringprep_xmpp_nodeprep_prohibit}, ++ {STRINGPREP_BIDI, 0, 0}, ++ {STRINGPREP_BIDI_PROHIBIT_TABLE, 0, stringprep_rfc3454_C_8}, ++ {STRINGPREP_BIDI_RAL_TABLE, 0, stringprep_rfc3454_D_1}, ++ {STRINGPREP_BIDI_L_TABLE, 0, stringprep_rfc3454_D_2}, ++ {STRINGPREP_UNASSIGNED_TABLE, ~STRINGPREP_NO_UNASSIGNED, ++ stringprep_rfc3454_A_1}, + {0} + }; + + const Stringprep_profile stringprep_xmpp_resourceprep[] = { +- {STRINGPREP_MAP_TABLE, 0, TABLE(B_1)}, +- {STRINGPREP_NFKC, 0, 0, 0}, +- {STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_1_2)}, +- {STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_2_1)}, +- {STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_2_2)}, +- {STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_3)}, +- {STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_4)}, +- {STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_5)}, +- {STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_6)}, +- {STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_7)}, +- {STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_8)}, +- {STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_9)}, +- {STRINGPREP_BIDI, 0, 0, 0}, +- {STRINGPREP_BIDI_PROHIBIT_TABLE, 0, TABLE(C_8)}, +- {STRINGPREP_BIDI_RAL_TABLE, ~STRINGPREP_NO_BIDI, TABLE(D_1)}, +- {STRINGPREP_BIDI_L_TABLE, ~STRINGPREP_NO_BIDI, TABLE(D_2)}, +- {STRINGPREP_UNASSIGNED_TABLE, ~STRINGPREP_NO_UNASSIGNED, TABLE(A_1)}, ++ {STRINGPREP_MAP_TABLE, 0, stringprep_rfc3454_B_1}, ++ {STRINGPREP_NFKC, 0, 0}, ++ {STRINGPREP_PROHIBIT_TABLE, 0, stringprep_rfc3454_C_1_2}, ++ {STRINGPREP_PROHIBIT_TABLE, 0, stringprep_rfc3454_C_2_1}, ++ {STRINGPREP_PROHIBIT_TABLE, 0, stringprep_rfc3454_C_2_2}, ++ {STRINGPREP_PROHIBIT_TABLE, 0, stringprep_rfc3454_C_3}, ++ {STRINGPREP_PROHIBIT_TABLE, 0, stringprep_rfc3454_C_4}, ++ {STRINGPREP_PROHIBIT_TABLE, 0, stringprep_rfc3454_C_5}, ++ {STRINGPREP_PROHIBIT_TABLE, 0, stringprep_rfc3454_C_6}, ++ {STRINGPREP_PROHIBIT_TABLE, 0, stringprep_rfc3454_C_7}, ++ {STRINGPREP_PROHIBIT_TABLE, 0, stringprep_rfc3454_C_8}, ++ {STRINGPREP_PROHIBIT_TABLE, 0, stringprep_rfc3454_C_9}, ++ {STRINGPREP_BIDI, 0, 0}, ++ {STRINGPREP_BIDI_PROHIBIT_TABLE, 0, stringprep_rfc3454_C_8}, ++ {STRINGPREP_BIDI_RAL_TABLE, ~STRINGPREP_NO_BIDI, stringprep_rfc3454_D_1}, ++ {STRINGPREP_BIDI_L_TABLE, ~STRINGPREP_NO_BIDI, stringprep_rfc3454_D_2}, ++ {STRINGPREP_UNASSIGNED_TABLE, ~STRINGPREP_NO_UNASSIGNED, ++ stringprep_rfc3454_A_1}, + {0} + }; + + const Stringprep_profile stringprep_plain[] = { +- {STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_2_1)}, +- {STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_2_2)}, +- {STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_3)}, +- {STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_4)}, +- {STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_5)}, +- {STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_6)}, +- {STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_8)}, +- {STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_9)}, +- {STRINGPREP_BIDI, 0, 0, 0}, +- {STRINGPREP_BIDI_PROHIBIT_TABLE, 0, TABLE(C_8)}, +- {STRINGPREP_BIDI_RAL_TABLE, ~STRINGPREP_NO_BIDI, TABLE(D_1)}, +- {STRINGPREP_BIDI_L_TABLE, ~STRINGPREP_NO_BIDI, TABLE(D_2)}, ++ {STRINGPREP_PROHIBIT_TABLE, 0, stringprep_rfc3454_C_2_1}, ++ {STRINGPREP_PROHIBIT_TABLE, 0, stringprep_rfc3454_C_2_2}, ++ {STRINGPREP_PROHIBIT_TABLE, 0, stringprep_rfc3454_C_3}, ++ {STRINGPREP_PROHIBIT_TABLE, 0, stringprep_rfc3454_C_4}, ++ {STRINGPREP_PROHIBIT_TABLE, 0, stringprep_rfc3454_C_5}, ++ {STRINGPREP_PROHIBIT_TABLE, 0, stringprep_rfc3454_C_6}, ++ {STRINGPREP_PROHIBIT_TABLE, 0, stringprep_rfc3454_C_8}, ++ {STRINGPREP_PROHIBIT_TABLE, 0, stringprep_rfc3454_C_9}, ++ {STRINGPREP_BIDI, 0, 0}, ++ {STRINGPREP_BIDI_PROHIBIT_TABLE, 0, stringprep_rfc3454_C_8}, ++ {STRINGPREP_BIDI_RAL_TABLE, ~STRINGPREP_NO_BIDI, stringprep_rfc3454_D_1}, ++ {STRINGPREP_BIDI_L_TABLE, ~STRINGPREP_NO_BIDI, stringprep_rfc3454_D_2}, + {0} + }; + + const Stringprep_profile stringprep_trace[] = { +- {STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_2_1)}, +- {STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_2_2)}, +- {STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_3)}, +- {STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_4)}, +- {STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_5)}, +- {STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_6)}, +- {STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_8)}, +- {STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_9)}, +- {STRINGPREP_BIDI, 0, 0, 0}, +- {STRINGPREP_BIDI_PROHIBIT_TABLE, 0, TABLE(C_8)}, +- {STRINGPREP_BIDI_RAL_TABLE, ~STRINGPREP_NO_BIDI, TABLE(D_1)}, +- {STRINGPREP_BIDI_L_TABLE, ~STRINGPREP_NO_BIDI, TABLE(D_2)}, ++ {STRINGPREP_PROHIBIT_TABLE, 0, stringprep_rfc3454_C_2_1}, ++ {STRINGPREP_PROHIBIT_TABLE, 0, stringprep_rfc3454_C_2_2}, ++ {STRINGPREP_PROHIBIT_TABLE, 0, stringprep_rfc3454_C_3}, ++ {STRINGPREP_PROHIBIT_TABLE, 0, stringprep_rfc3454_C_4}, ++ {STRINGPREP_PROHIBIT_TABLE, 0, stringprep_rfc3454_C_5}, ++ {STRINGPREP_PROHIBIT_TABLE, 0, stringprep_rfc3454_C_6}, ++ {STRINGPREP_PROHIBIT_TABLE, 0, stringprep_rfc3454_C_8}, ++ {STRINGPREP_PROHIBIT_TABLE, 0, stringprep_rfc3454_C_9}, ++ {STRINGPREP_BIDI, 0, 0}, ++ {STRINGPREP_BIDI_PROHIBIT_TABLE, 0, stringprep_rfc3454_C_8}, ++ {STRINGPREP_BIDI_RAL_TABLE, ~STRINGPREP_NO_BIDI, stringprep_rfc3454_D_1}, ++ {STRINGPREP_BIDI_L_TABLE, ~STRINGPREP_NO_BIDI, stringprep_rfc3454_D_2}, + {0} + }; + + const Stringprep_table_element stringprep_iscsi_prohibit[] = { +- {0x0000, 0x002C}, /* [ASCII CONTROL CHARACTERS and SPACE through ,] */ +- {0x002F, 0x002F}, /* [ASCII /] */ +- {0x003B, 0x0040}, /* [ASCII ; through @] */ +- {0x005B, 0x0060}, /* [ASCII [ through `] */ +- {0x007B, 0x007F}, /* [ASCII { through DEL] */ +- {0x3002, 0x3002}, /* ideographic full stop */ ++ /* NB, since start == 0, we must have that end != 0 for the ++ end-of-table logic to work. */ ++ {0x0000, 1}, /* [ASCII CONTROL CHARACTERS and SPACE through ,] */ ++ {0x0001}, ++ {0x0002}, ++ {0x0003}, ++ {0x0004}, ++ {0x0005}, ++ {0x0006}, ++ {0x0007}, ++ {0x0008}, ++ {0x0009}, ++ {0x000A}, ++ {0x000B}, ++ {0x000C}, ++ {0x000D}, ++ {0x000E}, ++ {0x000F}, ++ {0x0010}, ++ {0x0011}, ++ {0x0012}, ++ {0x0013}, ++ {0x0014}, ++ {0x0015}, ++ {0x0016}, ++ {0x0017}, ++ {0x0018}, ++ {0x0019}, ++ {0x001A}, ++ {0x001B}, ++ {0x001C}, ++ {0x001D}, ++ {0x001E}, ++ {0x001F}, ++ {0x0020}, ++ {0x0021}, ++ {0x0022}, ++ {0x0023}, ++ {0x0024}, ++ {0x0025}, ++ {0x0026}, ++ {0x0027}, ++ {0x0028}, ++ {0x0029}, ++ {0x002A}, ++ {0x002B}, ++ {0x002C}, ++ {0x002F}, /* [ASCII /] */ ++ {0x003B}, /* [ASCII ; through @] */ ++ {0x003C}, ++ {0x003D}, ++ {0x003E}, ++ {0x003F}, ++ {0x0040}, ++ {0x005B}, /* [ASCII [ through `] */ ++ {0x005C}, ++ {0x005D}, ++ {0x005E}, ++ {0x005F}, ++ {0x0060}, ++ {0x007B}, /* [ASCII { through DEL] */ ++ {0x007C}, ++ {0x007D}, ++ {0x007E}, ++ {0x007F}, ++ {0x3002}, /* ideographic full stop */ + {0} + }; + + const Stringprep_profile stringprep_iscsi[] = { +- {STRINGPREP_MAP_TABLE, 0, TABLE(B_1)}, +- {STRINGPREP_MAP_TABLE, 0, TABLE(B_2)}, +- {STRINGPREP_NFKC, 0, 0, 0}, +- {STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_1_1)}, +- {STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_1_2)}, +- {STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_2_1)}, +- {STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_2_2)}, +- {STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_3)}, +- {STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_4)}, +- {STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_5)}, +- {STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_6)}, +- {STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_7)}, +- {STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_8)}, +- {STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_9)}, +- {STRINGPREP_PROHIBIT_TABLE, 0, stringprep_iscsi_prohibit, countof(stringprep_iscsi_prohibit) - 1}, +- {STRINGPREP_BIDI, 0, 0, 0}, +- {STRINGPREP_BIDI_PROHIBIT_TABLE, 0, TABLE(C_8)}, +- {STRINGPREP_BIDI_RAL_TABLE, ~STRINGPREP_NO_BIDI, TABLE(D_1)}, +- {STRINGPREP_BIDI_L_TABLE, ~STRINGPREP_NO_BIDI, TABLE(D_2)}, +- {STRINGPREP_UNASSIGNED_TABLE, ~STRINGPREP_NO_UNASSIGNED, TABLE(A_1)}, ++ {STRINGPREP_MAP_TABLE, 0, stringprep_rfc3454_B_1}, ++ {STRINGPREP_MAP_TABLE, 0, stringprep_rfc3454_B_2}, ++ {STRINGPREP_NFKC, 0, 0}, ++ {STRINGPREP_PROHIBIT_TABLE, 0, stringprep_rfc3454_C_1_1}, ++ {STRINGPREP_PROHIBIT_TABLE, 0, stringprep_rfc3454_C_1_2}, ++ {STRINGPREP_PROHIBIT_TABLE, 0, stringprep_rfc3454_C_2_1}, ++ {STRINGPREP_PROHIBIT_TABLE, 0, stringprep_rfc3454_C_2_2}, ++ {STRINGPREP_PROHIBIT_TABLE, 0, stringprep_rfc3454_C_3}, ++ {STRINGPREP_PROHIBIT_TABLE, 0, stringprep_rfc3454_C_4}, ++ {STRINGPREP_PROHIBIT_TABLE, 0, stringprep_rfc3454_C_5}, ++ {STRINGPREP_PROHIBIT_TABLE, 0, stringprep_rfc3454_C_6}, ++ {STRINGPREP_PROHIBIT_TABLE, 0, stringprep_rfc3454_C_7}, ++ {STRINGPREP_PROHIBIT_TABLE, 0, stringprep_rfc3454_C_8}, ++ {STRINGPREP_PROHIBIT_TABLE, 0, stringprep_rfc3454_C_9}, ++ {STRINGPREP_PROHIBIT_TABLE, 0, stringprep_iscsi_prohibit}, ++ {STRINGPREP_BIDI, 0, 0}, ++ {STRINGPREP_BIDI_PROHIBIT_TABLE, 0, stringprep_rfc3454_C_8}, ++ {STRINGPREP_BIDI_RAL_TABLE, ~STRINGPREP_NO_BIDI, stringprep_rfc3454_D_1}, ++ {STRINGPREP_BIDI_L_TABLE, ~STRINGPREP_NO_BIDI, stringprep_rfc3454_D_2}, ++ {STRINGPREP_UNASSIGNED_TABLE, ~STRINGPREP_NO_UNASSIGNED, ++ stringprep_rfc3454_A_1}, + {0} + }; + + const Stringprep_table_element stringprep_saslprep_space_map[] = { +- {0x00A0, 0x00A0, {0x0020}}, /* 00A0; NO-BREAK SPACE */ +- {0x1680, 0x1680, {0x0020}}, /* 1680; OGHAM SPACE MARK */ +- {0x2000, 0x200B, {0x0020}}, /* 2000; EN QUAD */ +- /* 2001; EM QUAD */ +- /* 2002; EN SPACE */ +- /* 2003; EM SPACE */ +- /* 2004; THREE-PER-EM SPACE */ +- /* 2005; FOUR-PER-EM SPACE */ +- /* 2006; SIX-PER-EM SPACE */ +- /* 2007; FIGURE SPACE */ +- /* 2008; PUNCTUATION SPACE */ +- /* 2009; THIN SPACE */ +- /* 200A; HAIR SPACE */ +- /* 200B; ZERO WIDTH SPACE */ +- {0x202F, 0x202F, {0x0020}}, /* 202F; NARROW NO-BREAK SPACE */ +- {0x205F, 0x205F, {0x0020}}, /* 205F; MEDIUM MATHEMATICAL SPACE */ +- {0x3000, 0x3000, {0x0020}}, /* 3000; IDEOGRAPHIC SPACE */ ++ {0x0000A0, 0, {0x0020}}, /* 00A0; NO-BREAK SPACE */ ++ {0x001680, 0, {0x0020}}, /* 1680; OGHAM SPACE MARK */ ++ {0x002000, 0, {0x0020}}, /* 2000; EN QUAD */ ++ {0x002001, 0, {0x0020}}, /* 2001; EM QUAD */ ++ {0x002002, 0, {0x0020}}, /* 2002; EN SPACE */ ++ {0x002003, 0, {0x0020}}, /* 2003; EM SPACE */ ++ {0x002004, 0, {0x0020}}, /* 2004; THREE-PER-EM SPACE */ ++ {0x002005, 0, {0x0020}}, /* 2005; FOUR-PER-EM SPACE */ ++ {0x002006, 0, {0x0020}}, /* 2006; SIX-PER-EM SPACE */ ++ {0x002007, 0, {0x0020}}, /* 2007; FIGURE SPACE */ ++ {0x002008, 0, {0x0020}}, /* 2008; PUNCTUATION SPACE */ ++ {0x002009, 0, {0x0020}}, /* 2009; THIN SPACE */ ++ {0x00200A, 0, {0x0020}}, /* 200A; HAIR SPACE */ ++ {0x00200B, 0, {0x0020}}, /* 200B; ZERO WIDTH SPACE */ ++ {0x00202F, 0, {0x0020}}, /* 202F; NARROW NO-BREAK SPACE */ ++ {0x00205F, 0, {0x0020}}, /* 205F; MEDIUM MATHEMATICAL SPACE */ ++ {0x003000, 0, {0x0020}}, /* 3000; IDEOGRAPHIC SPACE */ + {0} + }; + + const Stringprep_profile stringprep_saslprep[] = { +- {STRINGPREP_MAP_TABLE, 0, stringprep_saslprep_space_map, countof(stringprep_saslprep_space_map) - 1}, +- {STRINGPREP_MAP_TABLE, 0, TABLE(B_1)}, +- {STRINGPREP_NFKC, 0, 0, 0}, +- {STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_1_2)}, +- {STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_2_1)}, +- {STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_2_2)}, +- {STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_3)}, +- {STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_4)}, +- {STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_5)}, +- {STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_6)}, +- {STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_7)}, +- {STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_8)}, +- {STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_9)}, +- {STRINGPREP_BIDI, 0, 0, 0}, +- {STRINGPREP_BIDI_PROHIBIT_TABLE, 0, TABLE(C_8)}, +- {STRINGPREP_BIDI_RAL_TABLE, ~STRINGPREP_NO_BIDI, TABLE(D_1)}, +- {STRINGPREP_BIDI_L_TABLE, ~STRINGPREP_NO_BIDI, TABLE(D_2)}, +- {STRINGPREP_UNASSIGNED_TABLE, ~STRINGPREP_NO_UNASSIGNED, TABLE(A_1)}, ++ {STRINGPREP_MAP_TABLE, 0, stringprep_saslprep_space_map}, ++ {STRINGPREP_MAP_TABLE, 0, stringprep_rfc3454_B_1}, ++ {STRINGPREP_NFKC, 0, 0}, ++ {STRINGPREP_PROHIBIT_TABLE, 0, stringprep_rfc3454_C_1_2}, ++ {STRINGPREP_PROHIBIT_TABLE, 0, stringprep_rfc3454_C_2_1}, ++ {STRINGPREP_PROHIBIT_TABLE, 0, stringprep_rfc3454_C_2_2}, ++ {STRINGPREP_PROHIBIT_TABLE, 0, stringprep_rfc3454_C_3}, ++ {STRINGPREP_PROHIBIT_TABLE, 0, stringprep_rfc3454_C_4}, ++ {STRINGPREP_PROHIBIT_TABLE, 0, stringprep_rfc3454_C_5}, ++ {STRINGPREP_PROHIBIT_TABLE, 0, stringprep_rfc3454_C_6}, ++ {STRINGPREP_PROHIBIT_TABLE, 0, stringprep_rfc3454_C_7}, ++ {STRINGPREP_PROHIBIT_TABLE, 0, stringprep_rfc3454_C_8}, ++ {STRINGPREP_PROHIBIT_TABLE, 0, stringprep_rfc3454_C_9}, ++ {STRINGPREP_BIDI, 0, 0}, ++ {STRINGPREP_BIDI_PROHIBIT_TABLE, 0, stringprep_rfc3454_C_8}, ++ {STRINGPREP_BIDI_RAL_TABLE, ~STRINGPREP_NO_BIDI, stringprep_rfc3454_D_1}, ++ {STRINGPREP_BIDI_L_TABLE, ~STRINGPREP_NO_BIDI, stringprep_rfc3454_D_2}, ++ {STRINGPREP_UNASSIGNED_TABLE, ~STRINGPREP_NO_UNASSIGNED, ++ stringprep_rfc3454_A_1}, + {0} + }; +diff -up libidn-1.34/lib/stringprep.c.tablesize-revert libidn-1.34/lib/stringprep.c +--- libidn-1.34/lib/stringprep.c.tablesize-revert 2017-07-12 21:40:56.000000000 +0200 ++++ libidn-1.34/lib/stringprep.c 2018-05-04 12:44:24.697588211 +0200 +@@ -36,20 +36,9 @@ + + #include "stringprep.h" + +-static int +-_compare_table_element (const uint32_t * c, const Stringprep_table_element * e) +-{ +- if (*c < e->start) +- return -1; +- if (*c > e->end) +- return 1; +- return 0; +-} +- + static ssize_t + stringprep_find_character_in_table (uint32_t ucs4, +- const Stringprep_table_element * table, +- size_t table_size) ++ const Stringprep_table_element * table) + { + /* This is where typical uses of Libidn spends very close to all CPU + time and causes most cache misses. One could easily do a binary +@@ -57,17 +46,8 @@ stringprep_find_character_in_table (uint + slowness is at all relevant in typical applications. (I don't + dispute optimization may improve matters significantly, I'm + mostly interested in having someone give real-world benchmark on +- the impact of libidn.) +- * +- * Answer (Tim Rühsen rockdaboot@gmx.de): +- * Testing the fuzz corpora just once via make check takes ~54 billion CPU cycles. +- * That is almost 20s on my Intel i3 3.1GHz !!! +- * That even makes fuzzing almost useless, eating up CPU cycles for nothing. +- * +- * The bsearch() approach takes ~3 billion CPU cycles. +- * Almost a factor of 20 faster (but still pretty slow). +- * There are still ~2 million calls to bsearch() which make ~30% of CPU time used. +- * Most time is spent in _g_utf8_normalize_wc(). ++ the impact of libidn.) */ ++ + + ssize_t i; + +@@ -75,27 +55,21 @@ stringprep_find_character_in_table (uint + if (ucs4 >= table[i].start && + ucs4 <= (table[i].end ? table[i].end : table[i].start)) + return i; +- */ +- +- const Stringprep_table_element * p = +- bsearch (&ucs4, table, table_size, sizeof(Stringprep_table_element), +- (int (*)(const void *, const void *)) _compare_table_element); + +- return p ? (p - table) : -1; ++ return -1; + } + + static ssize_t + stringprep_find_string_in_table (uint32_t * ucs4, + size_t ucs4len, + size_t * tablepos, +- const Stringprep_table_element * table, +- size_t table_size) ++ const Stringprep_table_element * table) + { + size_t j; + ssize_t pos; + + for (j = 0; j < ucs4len; j++) +- if ((pos = stringprep_find_character_in_table (ucs4[j], table, table_size)) != -1) ++ if ((pos = stringprep_find_character_in_table (ucs4[j], table)) != -1) + { + if (tablepos) + *tablepos = pos; +@@ -109,8 +83,7 @@ static int + stringprep_apply_table_to_string (uint32_t * ucs4, + size_t * ucs4len, + size_t maxucs4len, +- const Stringprep_table_element * table, +- size_t table_size) ++ const Stringprep_table_element * table) + { + ssize_t pos; + size_t i, maplen; +@@ -118,7 +91,7 @@ stringprep_apply_table_to_string (uint32 + size_t srclen = *ucs4len; /* length of unprocessed data */ + + while ((pos = stringprep_find_string_in_table (src, srclen, +- &i, table, table_size)) != -1) ++ &i, table)) != -1) + { + for (maplen = STRINGPREP_MAX_MAP_CHARS; + maplen > 0 && table[i].map[maplen - 1] == 0; maplen--) +@@ -220,7 +193,7 @@ stringprep_4i (uint32_t * ucs4, size_t * + + case STRINGPREP_PROHIBIT_TABLE: + k = stringprep_find_string_in_table (ucs4, ucs4len, +- NULL, profile[i].table, profile[i].table_size); ++ NULL, profile[i].table); + if (k != -1) + return STRINGPREP_CONTAINS_PROHIBITED; + break; +@@ -231,7 +204,7 @@ stringprep_4i (uint32_t * ucs4, size_t * + if (flags & STRINGPREP_NO_UNASSIGNED) + { + k = stringprep_find_string_in_table +- (ucs4, ucs4len, NULL, profile[i].table, profile[i].table_size); ++ (ucs4, ucs4len, NULL, profile[i].table); + if (k != -1) + return STRINGPREP_CONTAINS_UNASSIGNED; + } +@@ -241,7 +214,7 @@ stringprep_4i (uint32_t * ucs4, size_t * + if (UNAPPLICAPLEFLAGS (flags, profile[i].flags)) + break; + rc = stringprep_apply_table_to_string +- (ucs4, &ucs4len, maxucs4len, profile[i].table, profile[i].table_size); ++ (ucs4, &ucs4len, maxucs4len, profile[i].table); + if (rc != STRINGPREP_OK) + return rc; + break; +@@ -265,7 +238,7 @@ stringprep_4i (uint32_t * ucs4, size_t * + done_prohibited = 1; + k = stringprep_find_string_in_table (ucs4, ucs4len, + NULL, +- profile[j].table, profile[j].table_size); ++ profile[j].table); + if (k != -1) + return STRINGPREP_BIDI_CONTAINS_PROHIBITED; + } +@@ -273,14 +246,14 @@ stringprep_4i (uint32_t * ucs4, size_t * + { + done_ral = 1; + if (stringprep_find_string_in_table +- (ucs4, ucs4len, NULL, profile[j].table, profile[j].table_size) != -1) ++ (ucs4, ucs4len, NULL, profile[j].table) != -1) + contains_ral = j; + } + else if (profile[j].operation == STRINGPREP_BIDI_L_TABLE) + { + done_l = 1; + if (stringprep_find_string_in_table +- (ucs4, ucs4len, NULL, profile[j].table, profile[j].table_size) != -1) ++ (ucs4, ucs4len, NULL, profile[j].table) != -1) + contains_l = j; + } + +@@ -293,9 +266,9 @@ stringprep_4i (uint32_t * ucs4, size_t * + if (contains_ral != SIZE_MAX) + { + if (!(stringprep_find_character_in_table +- (ucs4[0], profile[contains_ral].table, profile[contains_ral].table_size) != -1 && ++ (ucs4[0], profile[contains_ral].table) != -1 && + stringprep_find_character_in_table +- (ucs4[ucs4len - 1], profile[contains_ral].table, profile[contains_ral].table_size) != -1)) ++ (ucs4[ucs4len - 1], profile[contains_ral].table) != -1)) + return STRINGPREP_BIDI_LEADTRAIL_NOT_RAL; + } + } +diff -up libidn-1.34/lib/stringprep.h.tablesize-revert libidn-1.34/lib/stringprep.h +--- libidn-1.34/lib/stringprep.h.tablesize-revert 2017-06-29 21:11:13.000000000 +0200 ++++ libidn-1.34/lib/stringprep.h 2018-05-04 12:44:24.697588211 +0200 +@@ -110,7 +110,6 @@ extern "C" + Stringprep_profile_steps operation; + Stringprep_profile_flags flags; + const Stringprep_table_element *table; +- size_t table_size; + }; + typedef struct Stringprep_table Stringprep_profile; + diff --git a/libidn.spec b/libidn.spec index 2da2b89..c410f67 100644 --- a/libidn.spec +++ b/libidn.spec @@ -12,6 +12,8 @@ License: LGPLv2+ and GPLv3+ and GFDL Source0: http://ftp.gnu.org/gnu/libidn/libidn-%{version}.tar.gz # Allow disabling Emacs support Patch0: libidn-1.33-Allow-disabling-Emacs-support.patch +# Fix ABI compatibility with libidn-1.33 and earlier +Patch1: libidn-tablesize-revert.patch BuildRequires: autoconf BuildRequires: automake @@ -77,6 +79,7 @@ This package contains javadoc for %{name}-java. %prep %setup -q %patch0 -p1 +%patch1 -p1 -b .tablesize-revert autoreconf -vif # Prevent from regenerating sources by gengetopt because it's broken. touch src/idn_cmd.c src/idn_cmd.h From 8231744fa3cc3aeb880b35497b7768455f5bf432 Mon Sep 17 00:00:00 2001 From: Miroslav Lichvar Date: Fri, 4 May 2018 13:06:21 +0200 Subject: [PATCH 123/157] add texinfo to build requirements --- libidn.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/libidn.spec b/libidn.spec index c410f67..04aafd4 100644 --- a/libidn.spec +++ b/libidn.spec @@ -18,6 +18,7 @@ Patch1: libidn-tablesize-revert.patch BuildRequires: autoconf BuildRequires: automake BuildRequires: libtool +BuildRequires: texinfo BuildRequires: gcc BuildRequires: gettext gettext-devel %if %{with libidn_enables_emacs} From 67cccff7210063fdeba8f22312dacc2445ff5d95 Mon Sep 17 00:00:00 2001 From: Miroslav Lichvar Date: Fri, 4 May 2018 13:08:21 +0200 Subject: [PATCH 124/157] 1.34-2 --- libidn.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/libidn.spec b/libidn.spec index 04aafd4..27dfb95 100644 --- a/libidn.spec +++ b/libidn.spec @@ -6,7 +6,7 @@ Summary: Internationalized Domain Name support library Name: libidn Version: 1.34 -Release: 1%{?dist} +Release: 2%{?dist} URL: http://www.gnu.org/software/libidn/ License: LGPLv2+ and GPLv3+ and GFDL Source0: http://ftp.gnu.org/gnu/libidn/libidn-%{version}.tar.gz @@ -201,6 +201,10 @@ fi %endif %changelog +* Fri May 04 2018 Miroslav Lichvar - 1.34-2 +- fix ABI compatibility with libidn-1.33 and earlier (#1566414 #1573961) +- add texinfo to build requirements + * Wed Apr 04 2018 Miroslav Lichvar - 1.34-1 - update to 1.34 (CVE-2017-14062) - include soname in file list From e991ec9370fe5705b6c49bb571f8dada1ac9670f Mon Sep 17 00:00:00 2001 From: Miroslav Lichvar Date: Mon, 14 May 2018 18:36:41 +0200 Subject: [PATCH 125/157] ignore install-info errors in post scriptlet (#1573966) --- libidn.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libidn.spec b/libidn.spec index 27dfb95..232c084 100644 --- a/libidn.spec +++ b/libidn.spec @@ -163,7 +163,7 @@ rm -rf $RPM_BUILD_ROOT%{_javadir}/libidn*.jar %find_lang %{name} %post -/sbin/install-info %{_infodir}/%{name}.info.gz %{_infodir}/dir +/sbin/install-info %{_infodir}/%{name}.info.gz %{_infodir}/dir || : %?ldconfig %preun From 8f6be8bee3cfe4ab0331a531bfff8213e337a78d Mon Sep 17 00:00:00 2001 From: Miroslav Lichvar Date: Mon, 14 May 2018 18:44:31 +0200 Subject: [PATCH 126/157] 1.34-3 --- libidn.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libidn.spec b/libidn.spec index 232c084..17e4935 100644 --- a/libidn.spec +++ b/libidn.spec @@ -6,7 +6,7 @@ Summary: Internationalized Domain Name support library Name: libidn Version: 1.34 -Release: 2%{?dist} +Release: 3%{?dist} URL: http://www.gnu.org/software/libidn/ License: LGPLv2+ and GPLv3+ and GFDL Source0: http://ftp.gnu.org/gnu/libidn/libidn-%{version}.tar.gz @@ -201,6 +201,9 @@ fi %endif %changelog +* Mon May 14 2018 Miroslav Lichvar - 1.34-3 +- ignore install-info errors in post scriptlet (#1573966) + * Fri May 04 2018 Miroslav Lichvar - 1.34-2 - fix ABI compatibility with libidn-1.33 and earlier (#1566414 #1573961) - add texinfo to build requirements From 765431049fd2d7174bfb262161f5f5503aa51c0b Mon Sep 17 00:00:00 2001 From: Miroslav Lichvar Date: Tue, 15 May 2018 11:36:52 +0200 Subject: [PATCH 127/157] update to 1.35 --- .gitignore | 2 +- libidn-tablesize-revert.patch | 758 ---------------------------------- libidn.spec | 12 +- sources | 2 +- 4 files changed, 8 insertions(+), 766 deletions(-) delete mode 100644 libidn-tablesize-revert.patch diff --git a/.gitignore b/.gitignore index 213427b..6fbf1fe 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ /libidn-1.?? -/libidn-1.34.tar.gz +/libidn-1.35.tar.gz diff --git a/libidn-tablesize-revert.patch b/libidn-tablesize-revert.patch deleted file mode 100644 index 13bf2b3..0000000 --- a/libidn-tablesize-revert.patch +++ /dev/null @@ -1,758 +0,0 @@ -This is a revert of - -commit 518b72c7273278d24cb79ac1485972e42cf98ed4 -Author: Tim Rühsen -Date: Thu Jun 29 12:52:57 2017 +0200 - - Increase speed of stringprep by ~20x - -diff -up libidn-1.34/lib/Makefile.am.tablesize-revert libidn-1.34/lib/Makefile.am ---- libidn-1.34/lib/Makefile.am.tablesize-revert 2017-07-14 20:18:42.000000000 +0200 -+++ libidn-1.34/lib/Makefile.am 2018-05-04 12:45:38.293778700 +0200 -@@ -28,7 +28,7 @@ lib_LTLIBRARIES = libidn.la - - idn_int = idn-int.h - --BUILT_SOURCES = $(idn_int) gunibreak.h gunicomp.h gunidecomp.h rfc3454.c rfc3454.h tlds.c -+BUILT_SOURCES = $(idn_int) gunibreak.h gunicomp.h gunidecomp.h rfc3454.c tlds.c - DISTCLEANFILES = $(idn_int) - include_HEADERS = stringprep.h idna.h punycode.h idn-free.h pr29.h - if TLD -@@ -46,7 +46,7 @@ idn-int.h: - libidn_la_SOURCES = libidn.map \ - gunibreak.h gunicomp.h gunidecomp.h \ - nfkc.c toutf8.c version.c \ -- stringprep.h stringprep.c rfc3454.c rfc3454.h profiles.c \ -+ stringprep.h stringprep.c rfc3454.c profiles.c \ - punycode.h punycode.c \ - idna.h idna.c \ - pr29.h pr29.c \ -@@ -82,7 +82,7 @@ SPEC = $(top_srcdir)/doc/specifications - #gunibreak.h gunicomp.h gunidecomp.h: gen-unicode-tables.pl $(SPEC)/UnicodeData-3.2.0.txt $(SPEC)/LineBreak-3.2.0.txt $(SPEC)/SpecialCasing-3.2.0.txt $(SPEC)/CaseFolding-3.2.0.txt $(SPEC)/CompositionExclusions-3.2.0.txt - # $(PERL) $(srcdir)/gen-unicode-tables.pl -decomp 3.2 $(SPEC) - --rfc3454.c rfc3454.h: gen-stringprep-tables.pl -+rfc3454.c: gen-stringprep-tables.pl - $(PERL) $(srcdir)/gen-stringprep-tables.pl $(SPEC)/rfc3454.txt - - tlds.c: gen-tld-tables.pl -diff -up libidn-1.34/lib/gen-stringprep-tables.pl.tablesize-revert libidn-1.34/lib/gen-stringprep-tables.pl ---- libidn-1.34/lib/gen-stringprep-tables.pl.tablesize-revert 2017-06-29 21:11:13.000000000 +0200 -+++ libidn-1.34/lib/gen-stringprep-tables.pl 2018-05-04 12:44:24.696588209 +0200 -@@ -22,13 +22,11 @@ use strict; - - my ($tab) = 59; - my ($intable) = 0; --my ($entries) = 0; - my ($tablename); - my ($varname); - my ($starheader, $header); - my ($profile) = "rfc3454"; - my ($filename) = "$profile.c"; --my ($headername) = "$profile.h"; - my ($line, $start, $end, @map); - - open(FH, ">$filename") or die "cannot open $filename for writing"; -@@ -39,10 +37,6 @@ print FH " Instead, edit gen-stringpre - print FH "#include \n"; - print FH "#include \"stringprep.h\"\n"; - --open(FHH, ">$headername") or die "cannot open $headername for writing"; --print FHH "/* This file is automatically generated. DO NOT EDIT!\n"; --print FHH " Instead, edit gen-stringprep-tables.pl and re-run. */\n\n"; -- - while(<>) { - s/^ (.*)/$1/g; # for rfc - $line = $_; -@@ -53,11 +47,9 @@ while(<>) { - if ($intable && m,^----- End Table (.*) -----,) { - die "table error" unless $1 eq $tablename || - ($1 eq "C.1.2" && $tablename eq "C.1.1"); # Typo in draft -+ $intable = 0; - print FH " { 0 },\n"; - print FH "};\n\n"; -- print FHH "#define N_STRINGPREP_${profile}_${varname} ${entries}\n"; -- $intable = 0; -- $entries = 0; - } - - if (m,^[A-Z],) { -@@ -92,28 +84,27 @@ while(<>) { - die "tables tried to map a range" if $end && $map[0]; - - if ($map[3]) { -- printf FH " { 0x%06s, 0x%06s, { 0x%06s,%*s/* %s */\n 0x%06s, 0x%06s, 0x%06s }},\n", -- $start, $start, $map[0], $tab-length($line)-13, " ", $line, -+ printf FH " { 0x%06s, 0, { 0x%06s,%*s/* %s */\n 0x%06s, 0x%06s, 0x%06s }},\n", -+ $start, $map[0], $tab-length($line)-13, " ", $line, - $map[1], $map[2], $map[3]; - } elsif ($map[2]) { -- printf FH " { 0x%06s, 0x%06s, { 0x%06s,%*s/* %s */\n 0x%06s, 0x%06s }},\n", -- $start, $start, $map[0], $tab-length($line)-14, " ", $line, -+ printf FH " { 0x%06s, 0, { 0x%06s,%*s/* %s */\n 0x%06s, 0x%06s }},\n", -+ $start, $map[0], $tab-length($line)-14, " ", $line, - $map[1], $map[2]; - } elsif ($map[1]) { -- printf FH " { 0x%06s, 0x%06s, { 0x%06s,%*s/* %s */\n 0x%06s }},\n", -- $start, $start, $map[0], $tab-length($line)-14, " ", $line, -+ printf FH " { 0x%06s, 0, { 0x%06s,%*s/* %s */\n 0x%06s }},\n", -+ $start, $map[0], $tab-length($line)-14, " ", $line, - $map[1]; - } elsif ($map[0]) { -- printf FH " { 0x%06s, 0x%06s, { 0x%06s }},%*s/* %s */\n", -- $start, $start, $map[0], $tab-length($line)-17, " ", $line; -+ printf FH " { 0x%06s, 0, { 0x%06s }},%*s/* %s */\n", -+ $start, $map[0], $tab-length($line)-17, " ", $line; - } elsif ($end) { - printf FH " { 0x%06s, 0x%06s },%*s/* %s */\n", - $start, $end, $tab-length($line)-11, " ", $line; - } else { -- printf FH " { 0x%06s, 0x%06s },%*s/* %s */\n", -- $start, $start, $tab-length($line)-11, " ", $line; -+ printf FH " { 0x%06s },%*s/* %s */\n", -+ $start, $tab-length($line)-11, " ", $line; - } -- $entries++; - } else { - $intable = 1 if !$intable; - $tablename = $1; -@@ -126,5 +117,4 @@ while(<>) { - } - } - --close FHH or die "cannot close $headername"; - close FH or die "cannot close $filename"; -diff -up libidn-1.34/lib/profiles.c.tablesize-revert libidn-1.34/lib/profiles.c ---- libidn-1.34/lib/profiles.c.tablesize-revert 2017-06-29 21:11:13.000000000 +0200 -+++ libidn-1.34/lib/profiles.c 2018-05-04 12:44:24.696588209 +0200 -@@ -29,7 +29,6 @@ - - #include - #include "stringprep.h" --#include "rfc3454.h" - - const Stringprep_profiles stringprep_profiles[] = { - {"Nameprep", stringprep_nameprep}, -@@ -44,219 +43,280 @@ const Stringprep_profiles stringprep_pro - {NULL, NULL} - }; - --/* number of elements within an array */ --#define countof(a) (sizeof(a)/sizeof(*(a))) -- --/* helper for profile definitions */ --#define TABLE(x) stringprep_rfc3454_##x, N_STRINGPREP_rfc3454_##x -- - const Stringprep_profile stringprep_nameprep[] = { -- {STRINGPREP_MAP_TABLE, 0, TABLE(B_1)}, -- {STRINGPREP_MAP_TABLE, 0, TABLE(B_2)}, -- {STRINGPREP_NFKC, 0, 0, 0}, -- {STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_1_2)}, -- {STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_2_2)}, -- {STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_3)}, -- {STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_4)}, -- {STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_5)}, -- {STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_6)}, -- {STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_7)}, -- {STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_8)}, -- {STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_9)}, -- {STRINGPREP_BIDI, 0, 0, 0}, -- {STRINGPREP_BIDI_PROHIBIT_TABLE, ~STRINGPREP_NO_BIDI, TABLE(C_8)}, -- {STRINGPREP_BIDI_RAL_TABLE, 0, TABLE(D_1)}, -- {STRINGPREP_BIDI_L_TABLE, 0, TABLE(D_2)}, -- {STRINGPREP_UNASSIGNED_TABLE, ~STRINGPREP_NO_UNASSIGNED, TABLE(A_1)}, -+ {STRINGPREP_MAP_TABLE, 0, stringprep_rfc3454_B_1}, -+ {STRINGPREP_MAP_TABLE, 0, stringprep_rfc3454_B_2}, -+ {STRINGPREP_NFKC, 0, 0}, -+ {STRINGPREP_PROHIBIT_TABLE, 0, stringprep_rfc3454_C_1_2}, -+ {STRINGPREP_PROHIBIT_TABLE, 0, stringprep_rfc3454_C_2_2}, -+ {STRINGPREP_PROHIBIT_TABLE, 0, stringprep_rfc3454_C_3}, -+ {STRINGPREP_PROHIBIT_TABLE, 0, stringprep_rfc3454_C_4}, -+ {STRINGPREP_PROHIBIT_TABLE, 0, stringprep_rfc3454_C_5}, -+ {STRINGPREP_PROHIBIT_TABLE, 0, stringprep_rfc3454_C_6}, -+ {STRINGPREP_PROHIBIT_TABLE, 0, stringprep_rfc3454_C_7}, -+ {STRINGPREP_PROHIBIT_TABLE, 0, stringprep_rfc3454_C_8}, -+ {STRINGPREP_PROHIBIT_TABLE, 0, stringprep_rfc3454_C_9}, -+ {STRINGPREP_BIDI, 0, 0}, -+ {STRINGPREP_BIDI_PROHIBIT_TABLE, ~STRINGPREP_NO_BIDI, -+ stringprep_rfc3454_C_8}, -+ {STRINGPREP_BIDI_RAL_TABLE, 0, stringprep_rfc3454_D_1}, -+ {STRINGPREP_BIDI_L_TABLE, 0, stringprep_rfc3454_D_2}, -+ {STRINGPREP_UNASSIGNED_TABLE, ~STRINGPREP_NO_UNASSIGNED, -+ stringprep_rfc3454_A_1}, - {0} - }; - - const Stringprep_profile stringprep_kerberos5[] = { - /* XXX this is likely to be wrong as the specification is - a rough draft. */ -- {STRINGPREP_MAP_TABLE, 0, TABLE(B_1)}, -- {STRINGPREP_MAP_TABLE, 0, TABLE(B_3)}, -- {STRINGPREP_NFKC, 0, 0, 0}, -- {STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_1_2)}, -- {STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_2_2)}, -- {STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_3)}, -- {STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_4)}, -- {STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_5)}, -- {STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_6)}, -- {STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_7)}, -- {STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_8)}, -- {STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_9)}, -- {STRINGPREP_BIDI, 0, 0, 0}, -- {STRINGPREP_BIDI_PROHIBIT_TABLE, ~STRINGPREP_NO_BIDI, TABLE(C_8)}, -- {STRINGPREP_BIDI_RAL_TABLE, 0, TABLE(D_1)}, -- {STRINGPREP_BIDI_L_TABLE, 0, TABLE(D_2)}, -- {STRINGPREP_UNASSIGNED_TABLE, ~STRINGPREP_NO_UNASSIGNED, TABLE(A_1)}, -+ {STRINGPREP_MAP_TABLE, 0, stringprep_rfc3454_B_1}, -+ {STRINGPREP_MAP_TABLE, 0, stringprep_rfc3454_B_3}, -+ {STRINGPREP_NFKC, 0, 0}, -+ {STRINGPREP_PROHIBIT_TABLE, 0, stringprep_rfc3454_C_1_2}, -+ {STRINGPREP_PROHIBIT_TABLE, 0, stringprep_rfc3454_C_2_2}, -+ {STRINGPREP_PROHIBIT_TABLE, 0, stringprep_rfc3454_C_3}, -+ {STRINGPREP_PROHIBIT_TABLE, 0, stringprep_rfc3454_C_4}, -+ {STRINGPREP_PROHIBIT_TABLE, 0, stringprep_rfc3454_C_5}, -+ {STRINGPREP_PROHIBIT_TABLE, 0, stringprep_rfc3454_C_6}, -+ {STRINGPREP_PROHIBIT_TABLE, 0, stringprep_rfc3454_C_7}, -+ {STRINGPREP_PROHIBIT_TABLE, 0, stringprep_rfc3454_C_8}, -+ {STRINGPREP_PROHIBIT_TABLE, 0, stringprep_rfc3454_C_9}, -+ {STRINGPREP_BIDI, 0, 0}, -+ {STRINGPREP_BIDI_PROHIBIT_TABLE, ~STRINGPREP_NO_BIDI, -+ stringprep_rfc3454_C_8}, -+ {STRINGPREP_BIDI_RAL_TABLE, 0, stringprep_rfc3454_D_1}, -+ {STRINGPREP_BIDI_L_TABLE, 0, stringprep_rfc3454_D_2}, -+ {STRINGPREP_UNASSIGNED_TABLE, ~STRINGPREP_NO_UNASSIGNED, -+ stringprep_rfc3454_A_1}, - {0} - }; - - const Stringprep_table_element stringprep_xmpp_nodeprep_prohibit[] = { -- {0x000022, 0x000022}, /* #x22 (") */ -- {0x000026, 0x000026}, /* #x26 (&) */ -- {0x000027, 0x000027}, /* #x27 (') */ -- {0x00002F, 0x00002F}, /* #x2F (/) */ -- {0x00003A, 0x00003A}, /* #x3A (:) */ -- {0x00003C, 0x00003C}, /* #x3C (<) */ -- {0x00003E, 0x00003E}, /* #x3E (>) */ -- {0x000040, 0x000040}, /* #x40 (@) */ -+ {0x000022}, /* #x22 (") */ -+ {0x000026}, /* #x26 (&) */ -+ {0x000027}, /* #x27 (') */ -+ {0x00002F}, /* #x2F (/) */ -+ {0x00003A}, /* #x3A (:) */ -+ {0x00003C}, /* #x3C (<) */ -+ {0x00003E}, /* #x3E (>) */ -+ {0x000040}, /* #x40 (@) */ - {0} - }; - - const Stringprep_profile stringprep_xmpp_nodeprep[] = { -- {STRINGPREP_MAP_TABLE, 0, TABLE(B_1)}, -- {STRINGPREP_MAP_TABLE, 0, TABLE(B_2)}, -- {STRINGPREP_NFKC, 0, 0, 0}, -- {STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_1_1)}, -- {STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_1_2)}, -- {STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_2_1)}, -- {STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_2_2)}, -- {STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_3)}, -- {STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_4)}, -- {STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_5)}, -- {STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_6)}, -- {STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_7)}, -- {STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_8)}, -- {STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_9)}, -- {STRINGPREP_PROHIBIT_TABLE, 0, stringprep_xmpp_nodeprep_prohibit, -- countof(stringprep_xmpp_nodeprep_prohibit) - 1}, -- {STRINGPREP_BIDI, 0, 0, 0}, -- {STRINGPREP_BIDI_PROHIBIT_TABLE, 0, TABLE(C_8)}, -- {STRINGPREP_BIDI_RAL_TABLE, 0, TABLE(D_1)}, -- {STRINGPREP_BIDI_L_TABLE, 0, TABLE(D_2)}, -- {STRINGPREP_UNASSIGNED_TABLE, ~STRINGPREP_NO_UNASSIGNED, TABLE(A_1)}, -+ {STRINGPREP_MAP_TABLE, 0, stringprep_rfc3454_B_1}, -+ {STRINGPREP_MAP_TABLE, 0, stringprep_rfc3454_B_2}, -+ {STRINGPREP_NFKC, 0, 0}, -+ {STRINGPREP_PROHIBIT_TABLE, 0, stringprep_rfc3454_C_1_1}, -+ {STRINGPREP_PROHIBIT_TABLE, 0, stringprep_rfc3454_C_1_2}, -+ {STRINGPREP_PROHIBIT_TABLE, 0, stringprep_rfc3454_C_2_1}, -+ {STRINGPREP_PROHIBIT_TABLE, 0, stringprep_rfc3454_C_2_2}, -+ {STRINGPREP_PROHIBIT_TABLE, 0, stringprep_rfc3454_C_3}, -+ {STRINGPREP_PROHIBIT_TABLE, 0, stringprep_rfc3454_C_4}, -+ {STRINGPREP_PROHIBIT_TABLE, 0, stringprep_rfc3454_C_5}, -+ {STRINGPREP_PROHIBIT_TABLE, 0, stringprep_rfc3454_C_6}, -+ {STRINGPREP_PROHIBIT_TABLE, 0, stringprep_rfc3454_C_7}, -+ {STRINGPREP_PROHIBIT_TABLE, 0, stringprep_rfc3454_C_8}, -+ {STRINGPREP_PROHIBIT_TABLE, 0, stringprep_rfc3454_C_9}, -+ {STRINGPREP_PROHIBIT_TABLE, 0, stringprep_xmpp_nodeprep_prohibit}, -+ {STRINGPREP_BIDI, 0, 0}, -+ {STRINGPREP_BIDI_PROHIBIT_TABLE, 0, stringprep_rfc3454_C_8}, -+ {STRINGPREP_BIDI_RAL_TABLE, 0, stringprep_rfc3454_D_1}, -+ {STRINGPREP_BIDI_L_TABLE, 0, stringprep_rfc3454_D_2}, -+ {STRINGPREP_UNASSIGNED_TABLE, ~STRINGPREP_NO_UNASSIGNED, -+ stringprep_rfc3454_A_1}, - {0} - }; - - const Stringprep_profile stringprep_xmpp_resourceprep[] = { -- {STRINGPREP_MAP_TABLE, 0, TABLE(B_1)}, -- {STRINGPREP_NFKC, 0, 0, 0}, -- {STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_1_2)}, -- {STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_2_1)}, -- {STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_2_2)}, -- {STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_3)}, -- {STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_4)}, -- {STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_5)}, -- {STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_6)}, -- {STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_7)}, -- {STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_8)}, -- {STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_9)}, -- {STRINGPREP_BIDI, 0, 0, 0}, -- {STRINGPREP_BIDI_PROHIBIT_TABLE, 0, TABLE(C_8)}, -- {STRINGPREP_BIDI_RAL_TABLE, ~STRINGPREP_NO_BIDI, TABLE(D_1)}, -- {STRINGPREP_BIDI_L_TABLE, ~STRINGPREP_NO_BIDI, TABLE(D_2)}, -- {STRINGPREP_UNASSIGNED_TABLE, ~STRINGPREP_NO_UNASSIGNED, TABLE(A_1)}, -+ {STRINGPREP_MAP_TABLE, 0, stringprep_rfc3454_B_1}, -+ {STRINGPREP_NFKC, 0, 0}, -+ {STRINGPREP_PROHIBIT_TABLE, 0, stringprep_rfc3454_C_1_2}, -+ {STRINGPREP_PROHIBIT_TABLE, 0, stringprep_rfc3454_C_2_1}, -+ {STRINGPREP_PROHIBIT_TABLE, 0, stringprep_rfc3454_C_2_2}, -+ {STRINGPREP_PROHIBIT_TABLE, 0, stringprep_rfc3454_C_3}, -+ {STRINGPREP_PROHIBIT_TABLE, 0, stringprep_rfc3454_C_4}, -+ {STRINGPREP_PROHIBIT_TABLE, 0, stringprep_rfc3454_C_5}, -+ {STRINGPREP_PROHIBIT_TABLE, 0, stringprep_rfc3454_C_6}, -+ {STRINGPREP_PROHIBIT_TABLE, 0, stringprep_rfc3454_C_7}, -+ {STRINGPREP_PROHIBIT_TABLE, 0, stringprep_rfc3454_C_8}, -+ {STRINGPREP_PROHIBIT_TABLE, 0, stringprep_rfc3454_C_9}, -+ {STRINGPREP_BIDI, 0, 0}, -+ {STRINGPREP_BIDI_PROHIBIT_TABLE, 0, stringprep_rfc3454_C_8}, -+ {STRINGPREP_BIDI_RAL_TABLE, ~STRINGPREP_NO_BIDI, stringprep_rfc3454_D_1}, -+ {STRINGPREP_BIDI_L_TABLE, ~STRINGPREP_NO_BIDI, stringprep_rfc3454_D_2}, -+ {STRINGPREP_UNASSIGNED_TABLE, ~STRINGPREP_NO_UNASSIGNED, -+ stringprep_rfc3454_A_1}, - {0} - }; - - const Stringprep_profile stringprep_plain[] = { -- {STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_2_1)}, -- {STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_2_2)}, -- {STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_3)}, -- {STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_4)}, -- {STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_5)}, -- {STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_6)}, -- {STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_8)}, -- {STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_9)}, -- {STRINGPREP_BIDI, 0, 0, 0}, -- {STRINGPREP_BIDI_PROHIBIT_TABLE, 0, TABLE(C_8)}, -- {STRINGPREP_BIDI_RAL_TABLE, ~STRINGPREP_NO_BIDI, TABLE(D_1)}, -- {STRINGPREP_BIDI_L_TABLE, ~STRINGPREP_NO_BIDI, TABLE(D_2)}, -+ {STRINGPREP_PROHIBIT_TABLE, 0, stringprep_rfc3454_C_2_1}, -+ {STRINGPREP_PROHIBIT_TABLE, 0, stringprep_rfc3454_C_2_2}, -+ {STRINGPREP_PROHIBIT_TABLE, 0, stringprep_rfc3454_C_3}, -+ {STRINGPREP_PROHIBIT_TABLE, 0, stringprep_rfc3454_C_4}, -+ {STRINGPREP_PROHIBIT_TABLE, 0, stringprep_rfc3454_C_5}, -+ {STRINGPREP_PROHIBIT_TABLE, 0, stringprep_rfc3454_C_6}, -+ {STRINGPREP_PROHIBIT_TABLE, 0, stringprep_rfc3454_C_8}, -+ {STRINGPREP_PROHIBIT_TABLE, 0, stringprep_rfc3454_C_9}, -+ {STRINGPREP_BIDI, 0, 0}, -+ {STRINGPREP_BIDI_PROHIBIT_TABLE, 0, stringprep_rfc3454_C_8}, -+ {STRINGPREP_BIDI_RAL_TABLE, ~STRINGPREP_NO_BIDI, stringprep_rfc3454_D_1}, -+ {STRINGPREP_BIDI_L_TABLE, ~STRINGPREP_NO_BIDI, stringprep_rfc3454_D_2}, - {0} - }; - - const Stringprep_profile stringprep_trace[] = { -- {STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_2_1)}, -- {STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_2_2)}, -- {STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_3)}, -- {STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_4)}, -- {STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_5)}, -- {STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_6)}, -- {STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_8)}, -- {STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_9)}, -- {STRINGPREP_BIDI, 0, 0, 0}, -- {STRINGPREP_BIDI_PROHIBIT_TABLE, 0, TABLE(C_8)}, -- {STRINGPREP_BIDI_RAL_TABLE, ~STRINGPREP_NO_BIDI, TABLE(D_1)}, -- {STRINGPREP_BIDI_L_TABLE, ~STRINGPREP_NO_BIDI, TABLE(D_2)}, -+ {STRINGPREP_PROHIBIT_TABLE, 0, stringprep_rfc3454_C_2_1}, -+ {STRINGPREP_PROHIBIT_TABLE, 0, stringprep_rfc3454_C_2_2}, -+ {STRINGPREP_PROHIBIT_TABLE, 0, stringprep_rfc3454_C_3}, -+ {STRINGPREP_PROHIBIT_TABLE, 0, stringprep_rfc3454_C_4}, -+ {STRINGPREP_PROHIBIT_TABLE, 0, stringprep_rfc3454_C_5}, -+ {STRINGPREP_PROHIBIT_TABLE, 0, stringprep_rfc3454_C_6}, -+ {STRINGPREP_PROHIBIT_TABLE, 0, stringprep_rfc3454_C_8}, -+ {STRINGPREP_PROHIBIT_TABLE, 0, stringprep_rfc3454_C_9}, -+ {STRINGPREP_BIDI, 0, 0}, -+ {STRINGPREP_BIDI_PROHIBIT_TABLE, 0, stringprep_rfc3454_C_8}, -+ {STRINGPREP_BIDI_RAL_TABLE, ~STRINGPREP_NO_BIDI, stringprep_rfc3454_D_1}, -+ {STRINGPREP_BIDI_L_TABLE, ~STRINGPREP_NO_BIDI, stringprep_rfc3454_D_2}, - {0} - }; - - const Stringprep_table_element stringprep_iscsi_prohibit[] = { -- {0x0000, 0x002C}, /* [ASCII CONTROL CHARACTERS and SPACE through ,] */ -- {0x002F, 0x002F}, /* [ASCII /] */ -- {0x003B, 0x0040}, /* [ASCII ; through @] */ -- {0x005B, 0x0060}, /* [ASCII [ through `] */ -- {0x007B, 0x007F}, /* [ASCII { through DEL] */ -- {0x3002, 0x3002}, /* ideographic full stop */ -+ /* NB, since start == 0, we must have that end != 0 for the -+ end-of-table logic to work. */ -+ {0x0000, 1}, /* [ASCII CONTROL CHARACTERS and SPACE through ,] */ -+ {0x0001}, -+ {0x0002}, -+ {0x0003}, -+ {0x0004}, -+ {0x0005}, -+ {0x0006}, -+ {0x0007}, -+ {0x0008}, -+ {0x0009}, -+ {0x000A}, -+ {0x000B}, -+ {0x000C}, -+ {0x000D}, -+ {0x000E}, -+ {0x000F}, -+ {0x0010}, -+ {0x0011}, -+ {0x0012}, -+ {0x0013}, -+ {0x0014}, -+ {0x0015}, -+ {0x0016}, -+ {0x0017}, -+ {0x0018}, -+ {0x0019}, -+ {0x001A}, -+ {0x001B}, -+ {0x001C}, -+ {0x001D}, -+ {0x001E}, -+ {0x001F}, -+ {0x0020}, -+ {0x0021}, -+ {0x0022}, -+ {0x0023}, -+ {0x0024}, -+ {0x0025}, -+ {0x0026}, -+ {0x0027}, -+ {0x0028}, -+ {0x0029}, -+ {0x002A}, -+ {0x002B}, -+ {0x002C}, -+ {0x002F}, /* [ASCII /] */ -+ {0x003B}, /* [ASCII ; through @] */ -+ {0x003C}, -+ {0x003D}, -+ {0x003E}, -+ {0x003F}, -+ {0x0040}, -+ {0x005B}, /* [ASCII [ through `] */ -+ {0x005C}, -+ {0x005D}, -+ {0x005E}, -+ {0x005F}, -+ {0x0060}, -+ {0x007B}, /* [ASCII { through DEL] */ -+ {0x007C}, -+ {0x007D}, -+ {0x007E}, -+ {0x007F}, -+ {0x3002}, /* ideographic full stop */ - {0} - }; - - const Stringprep_profile stringprep_iscsi[] = { -- {STRINGPREP_MAP_TABLE, 0, TABLE(B_1)}, -- {STRINGPREP_MAP_TABLE, 0, TABLE(B_2)}, -- {STRINGPREP_NFKC, 0, 0, 0}, -- {STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_1_1)}, -- {STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_1_2)}, -- {STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_2_1)}, -- {STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_2_2)}, -- {STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_3)}, -- {STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_4)}, -- {STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_5)}, -- {STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_6)}, -- {STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_7)}, -- {STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_8)}, -- {STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_9)}, -- {STRINGPREP_PROHIBIT_TABLE, 0, stringprep_iscsi_prohibit, countof(stringprep_iscsi_prohibit) - 1}, -- {STRINGPREP_BIDI, 0, 0, 0}, -- {STRINGPREP_BIDI_PROHIBIT_TABLE, 0, TABLE(C_8)}, -- {STRINGPREP_BIDI_RAL_TABLE, ~STRINGPREP_NO_BIDI, TABLE(D_1)}, -- {STRINGPREP_BIDI_L_TABLE, ~STRINGPREP_NO_BIDI, TABLE(D_2)}, -- {STRINGPREP_UNASSIGNED_TABLE, ~STRINGPREP_NO_UNASSIGNED, TABLE(A_1)}, -+ {STRINGPREP_MAP_TABLE, 0, stringprep_rfc3454_B_1}, -+ {STRINGPREP_MAP_TABLE, 0, stringprep_rfc3454_B_2}, -+ {STRINGPREP_NFKC, 0, 0}, -+ {STRINGPREP_PROHIBIT_TABLE, 0, stringprep_rfc3454_C_1_1}, -+ {STRINGPREP_PROHIBIT_TABLE, 0, stringprep_rfc3454_C_1_2}, -+ {STRINGPREP_PROHIBIT_TABLE, 0, stringprep_rfc3454_C_2_1}, -+ {STRINGPREP_PROHIBIT_TABLE, 0, stringprep_rfc3454_C_2_2}, -+ {STRINGPREP_PROHIBIT_TABLE, 0, stringprep_rfc3454_C_3}, -+ {STRINGPREP_PROHIBIT_TABLE, 0, stringprep_rfc3454_C_4}, -+ {STRINGPREP_PROHIBIT_TABLE, 0, stringprep_rfc3454_C_5}, -+ {STRINGPREP_PROHIBIT_TABLE, 0, stringprep_rfc3454_C_6}, -+ {STRINGPREP_PROHIBIT_TABLE, 0, stringprep_rfc3454_C_7}, -+ {STRINGPREP_PROHIBIT_TABLE, 0, stringprep_rfc3454_C_8}, -+ {STRINGPREP_PROHIBIT_TABLE, 0, stringprep_rfc3454_C_9}, -+ {STRINGPREP_PROHIBIT_TABLE, 0, stringprep_iscsi_prohibit}, -+ {STRINGPREP_BIDI, 0, 0}, -+ {STRINGPREP_BIDI_PROHIBIT_TABLE, 0, stringprep_rfc3454_C_8}, -+ {STRINGPREP_BIDI_RAL_TABLE, ~STRINGPREP_NO_BIDI, stringprep_rfc3454_D_1}, -+ {STRINGPREP_BIDI_L_TABLE, ~STRINGPREP_NO_BIDI, stringprep_rfc3454_D_2}, -+ {STRINGPREP_UNASSIGNED_TABLE, ~STRINGPREP_NO_UNASSIGNED, -+ stringprep_rfc3454_A_1}, - {0} - }; - - const Stringprep_table_element stringprep_saslprep_space_map[] = { -- {0x00A0, 0x00A0, {0x0020}}, /* 00A0; NO-BREAK SPACE */ -- {0x1680, 0x1680, {0x0020}}, /* 1680; OGHAM SPACE MARK */ -- {0x2000, 0x200B, {0x0020}}, /* 2000; EN QUAD */ -- /* 2001; EM QUAD */ -- /* 2002; EN SPACE */ -- /* 2003; EM SPACE */ -- /* 2004; THREE-PER-EM SPACE */ -- /* 2005; FOUR-PER-EM SPACE */ -- /* 2006; SIX-PER-EM SPACE */ -- /* 2007; FIGURE SPACE */ -- /* 2008; PUNCTUATION SPACE */ -- /* 2009; THIN SPACE */ -- /* 200A; HAIR SPACE */ -- /* 200B; ZERO WIDTH SPACE */ -- {0x202F, 0x202F, {0x0020}}, /* 202F; NARROW NO-BREAK SPACE */ -- {0x205F, 0x205F, {0x0020}}, /* 205F; MEDIUM MATHEMATICAL SPACE */ -- {0x3000, 0x3000, {0x0020}}, /* 3000; IDEOGRAPHIC SPACE */ -+ {0x0000A0, 0, {0x0020}}, /* 00A0; NO-BREAK SPACE */ -+ {0x001680, 0, {0x0020}}, /* 1680; OGHAM SPACE MARK */ -+ {0x002000, 0, {0x0020}}, /* 2000; EN QUAD */ -+ {0x002001, 0, {0x0020}}, /* 2001; EM QUAD */ -+ {0x002002, 0, {0x0020}}, /* 2002; EN SPACE */ -+ {0x002003, 0, {0x0020}}, /* 2003; EM SPACE */ -+ {0x002004, 0, {0x0020}}, /* 2004; THREE-PER-EM SPACE */ -+ {0x002005, 0, {0x0020}}, /* 2005; FOUR-PER-EM SPACE */ -+ {0x002006, 0, {0x0020}}, /* 2006; SIX-PER-EM SPACE */ -+ {0x002007, 0, {0x0020}}, /* 2007; FIGURE SPACE */ -+ {0x002008, 0, {0x0020}}, /* 2008; PUNCTUATION SPACE */ -+ {0x002009, 0, {0x0020}}, /* 2009; THIN SPACE */ -+ {0x00200A, 0, {0x0020}}, /* 200A; HAIR SPACE */ -+ {0x00200B, 0, {0x0020}}, /* 200B; ZERO WIDTH SPACE */ -+ {0x00202F, 0, {0x0020}}, /* 202F; NARROW NO-BREAK SPACE */ -+ {0x00205F, 0, {0x0020}}, /* 205F; MEDIUM MATHEMATICAL SPACE */ -+ {0x003000, 0, {0x0020}}, /* 3000; IDEOGRAPHIC SPACE */ - {0} - }; - - const Stringprep_profile stringprep_saslprep[] = { -- {STRINGPREP_MAP_TABLE, 0, stringprep_saslprep_space_map, countof(stringprep_saslprep_space_map) - 1}, -- {STRINGPREP_MAP_TABLE, 0, TABLE(B_1)}, -- {STRINGPREP_NFKC, 0, 0, 0}, -- {STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_1_2)}, -- {STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_2_1)}, -- {STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_2_2)}, -- {STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_3)}, -- {STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_4)}, -- {STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_5)}, -- {STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_6)}, -- {STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_7)}, -- {STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_8)}, -- {STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_9)}, -- {STRINGPREP_BIDI, 0, 0, 0}, -- {STRINGPREP_BIDI_PROHIBIT_TABLE, 0, TABLE(C_8)}, -- {STRINGPREP_BIDI_RAL_TABLE, ~STRINGPREP_NO_BIDI, TABLE(D_1)}, -- {STRINGPREP_BIDI_L_TABLE, ~STRINGPREP_NO_BIDI, TABLE(D_2)}, -- {STRINGPREP_UNASSIGNED_TABLE, ~STRINGPREP_NO_UNASSIGNED, TABLE(A_1)}, -+ {STRINGPREP_MAP_TABLE, 0, stringprep_saslprep_space_map}, -+ {STRINGPREP_MAP_TABLE, 0, stringprep_rfc3454_B_1}, -+ {STRINGPREP_NFKC, 0, 0}, -+ {STRINGPREP_PROHIBIT_TABLE, 0, stringprep_rfc3454_C_1_2}, -+ {STRINGPREP_PROHIBIT_TABLE, 0, stringprep_rfc3454_C_2_1}, -+ {STRINGPREP_PROHIBIT_TABLE, 0, stringprep_rfc3454_C_2_2}, -+ {STRINGPREP_PROHIBIT_TABLE, 0, stringprep_rfc3454_C_3}, -+ {STRINGPREP_PROHIBIT_TABLE, 0, stringprep_rfc3454_C_4}, -+ {STRINGPREP_PROHIBIT_TABLE, 0, stringprep_rfc3454_C_5}, -+ {STRINGPREP_PROHIBIT_TABLE, 0, stringprep_rfc3454_C_6}, -+ {STRINGPREP_PROHIBIT_TABLE, 0, stringprep_rfc3454_C_7}, -+ {STRINGPREP_PROHIBIT_TABLE, 0, stringprep_rfc3454_C_8}, -+ {STRINGPREP_PROHIBIT_TABLE, 0, stringprep_rfc3454_C_9}, -+ {STRINGPREP_BIDI, 0, 0}, -+ {STRINGPREP_BIDI_PROHIBIT_TABLE, 0, stringprep_rfc3454_C_8}, -+ {STRINGPREP_BIDI_RAL_TABLE, ~STRINGPREP_NO_BIDI, stringprep_rfc3454_D_1}, -+ {STRINGPREP_BIDI_L_TABLE, ~STRINGPREP_NO_BIDI, stringprep_rfc3454_D_2}, -+ {STRINGPREP_UNASSIGNED_TABLE, ~STRINGPREP_NO_UNASSIGNED, -+ stringprep_rfc3454_A_1}, - {0} - }; -diff -up libidn-1.34/lib/stringprep.c.tablesize-revert libidn-1.34/lib/stringprep.c ---- libidn-1.34/lib/stringprep.c.tablesize-revert 2017-07-12 21:40:56.000000000 +0200 -+++ libidn-1.34/lib/stringprep.c 2018-05-04 12:44:24.697588211 +0200 -@@ -36,20 +36,9 @@ - - #include "stringprep.h" - --static int --_compare_table_element (const uint32_t * c, const Stringprep_table_element * e) --{ -- if (*c < e->start) -- return -1; -- if (*c > e->end) -- return 1; -- return 0; --} -- - static ssize_t - stringprep_find_character_in_table (uint32_t ucs4, -- const Stringprep_table_element * table, -- size_t table_size) -+ const Stringprep_table_element * table) - { - /* This is where typical uses of Libidn spends very close to all CPU - time and causes most cache misses. One could easily do a binary -@@ -57,17 +46,8 @@ stringprep_find_character_in_table (uint - slowness is at all relevant in typical applications. (I don't - dispute optimization may improve matters significantly, I'm - mostly interested in having someone give real-world benchmark on -- the impact of libidn.) -- * -- * Answer (Tim Rühsen rockdaboot@gmx.de): -- * Testing the fuzz corpora just once via make check takes ~54 billion CPU cycles. -- * That is almost 20s on my Intel i3 3.1GHz !!! -- * That even makes fuzzing almost useless, eating up CPU cycles for nothing. -- * -- * The bsearch() approach takes ~3 billion CPU cycles. -- * Almost a factor of 20 faster (but still pretty slow). -- * There are still ~2 million calls to bsearch() which make ~30% of CPU time used. -- * Most time is spent in _g_utf8_normalize_wc(). -+ the impact of libidn.) */ -+ - - ssize_t i; - -@@ -75,27 +55,21 @@ stringprep_find_character_in_table (uint - if (ucs4 >= table[i].start && - ucs4 <= (table[i].end ? table[i].end : table[i].start)) - return i; -- */ -- -- const Stringprep_table_element * p = -- bsearch (&ucs4, table, table_size, sizeof(Stringprep_table_element), -- (int (*)(const void *, const void *)) _compare_table_element); - -- return p ? (p - table) : -1; -+ return -1; - } - - static ssize_t - stringprep_find_string_in_table (uint32_t * ucs4, - size_t ucs4len, - size_t * tablepos, -- const Stringprep_table_element * table, -- size_t table_size) -+ const Stringprep_table_element * table) - { - size_t j; - ssize_t pos; - - for (j = 0; j < ucs4len; j++) -- if ((pos = stringprep_find_character_in_table (ucs4[j], table, table_size)) != -1) -+ if ((pos = stringprep_find_character_in_table (ucs4[j], table)) != -1) - { - if (tablepos) - *tablepos = pos; -@@ -109,8 +83,7 @@ static int - stringprep_apply_table_to_string (uint32_t * ucs4, - size_t * ucs4len, - size_t maxucs4len, -- const Stringprep_table_element * table, -- size_t table_size) -+ const Stringprep_table_element * table) - { - ssize_t pos; - size_t i, maplen; -@@ -118,7 +91,7 @@ stringprep_apply_table_to_string (uint32 - size_t srclen = *ucs4len; /* length of unprocessed data */ - - while ((pos = stringprep_find_string_in_table (src, srclen, -- &i, table, table_size)) != -1) -+ &i, table)) != -1) - { - for (maplen = STRINGPREP_MAX_MAP_CHARS; - maplen > 0 && table[i].map[maplen - 1] == 0; maplen--) -@@ -220,7 +193,7 @@ stringprep_4i (uint32_t * ucs4, size_t * - - case STRINGPREP_PROHIBIT_TABLE: - k = stringprep_find_string_in_table (ucs4, ucs4len, -- NULL, profile[i].table, profile[i].table_size); -+ NULL, profile[i].table); - if (k != -1) - return STRINGPREP_CONTAINS_PROHIBITED; - break; -@@ -231,7 +204,7 @@ stringprep_4i (uint32_t * ucs4, size_t * - if (flags & STRINGPREP_NO_UNASSIGNED) - { - k = stringprep_find_string_in_table -- (ucs4, ucs4len, NULL, profile[i].table, profile[i].table_size); -+ (ucs4, ucs4len, NULL, profile[i].table); - if (k != -1) - return STRINGPREP_CONTAINS_UNASSIGNED; - } -@@ -241,7 +214,7 @@ stringprep_4i (uint32_t * ucs4, size_t * - if (UNAPPLICAPLEFLAGS (flags, profile[i].flags)) - break; - rc = stringprep_apply_table_to_string -- (ucs4, &ucs4len, maxucs4len, profile[i].table, profile[i].table_size); -+ (ucs4, &ucs4len, maxucs4len, profile[i].table); - if (rc != STRINGPREP_OK) - return rc; - break; -@@ -265,7 +238,7 @@ stringprep_4i (uint32_t * ucs4, size_t * - done_prohibited = 1; - k = stringprep_find_string_in_table (ucs4, ucs4len, - NULL, -- profile[j].table, profile[j].table_size); -+ profile[j].table); - if (k != -1) - return STRINGPREP_BIDI_CONTAINS_PROHIBITED; - } -@@ -273,14 +246,14 @@ stringprep_4i (uint32_t * ucs4, size_t * - { - done_ral = 1; - if (stringprep_find_string_in_table -- (ucs4, ucs4len, NULL, profile[j].table, profile[j].table_size) != -1) -+ (ucs4, ucs4len, NULL, profile[j].table) != -1) - contains_ral = j; - } - else if (profile[j].operation == STRINGPREP_BIDI_L_TABLE) - { - done_l = 1; - if (stringprep_find_string_in_table -- (ucs4, ucs4len, NULL, profile[j].table, profile[j].table_size) != -1) -+ (ucs4, ucs4len, NULL, profile[j].table) != -1) - contains_l = j; - } - -@@ -293,9 +266,9 @@ stringprep_4i (uint32_t * ucs4, size_t * - if (contains_ral != SIZE_MAX) - { - if (!(stringprep_find_character_in_table -- (ucs4[0], profile[contains_ral].table, profile[contains_ral].table_size) != -1 && -+ (ucs4[0], profile[contains_ral].table) != -1 && - stringprep_find_character_in_table -- (ucs4[ucs4len - 1], profile[contains_ral].table, profile[contains_ral].table_size) != -1)) -+ (ucs4[ucs4len - 1], profile[contains_ral].table) != -1)) - return STRINGPREP_BIDI_LEADTRAIL_NOT_RAL; - } - } -diff -up libidn-1.34/lib/stringprep.h.tablesize-revert libidn-1.34/lib/stringprep.h ---- libidn-1.34/lib/stringprep.h.tablesize-revert 2017-06-29 21:11:13.000000000 +0200 -+++ libidn-1.34/lib/stringprep.h 2018-05-04 12:44:24.697588211 +0200 -@@ -110,7 +110,6 @@ extern "C" - Stringprep_profile_steps operation; - Stringprep_profile_flags flags; - const Stringprep_table_element *table; -- size_t table_size; - }; - typedef struct Stringprep_table Stringprep_profile; - diff --git a/libidn.spec b/libidn.spec index 17e4935..d361966 100644 --- a/libidn.spec +++ b/libidn.spec @@ -5,17 +5,15 @@ Summary: Internationalized Domain Name support library Name: libidn -Version: 1.34 +Version: 1.35 Release: 3%{?dist} URL: http://www.gnu.org/software/libidn/ License: LGPLv2+ and GPLv3+ and GFDL Source0: http://ftp.gnu.org/gnu/libidn/libidn-%{version}.tar.gz # Allow disabling Emacs support Patch0: libidn-1.33-Allow-disabling-Emacs-support.patch -# Fix ABI compatibility with libidn-1.33 and earlier -Patch1: libidn-tablesize-revert.patch -BuildRequires: autoconf +BuildRequires: autoconf autoconf-archive BuildRequires: automake BuildRequires: libtool BuildRequires: texinfo @@ -80,7 +78,6 @@ This package contains javadoc for %{name}-java. %prep %setup -q %patch0 -p1 -%patch1 -p1 -b .tablesize-revert autoreconf -vif # Prevent from regenerating sources by gengetopt because it's broken. touch src/idn_cmd.c src/idn_cmd.h @@ -118,6 +115,9 @@ mv iconv.tmp doc/libidn.info sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool +# without RPATH this needs to be set for idn executed by help2man +export LD_LIBRARY_PATH=$(pwd)/lib/.libs + make %{?_smp_mflags} V=1 %check @@ -179,7 +179,7 @@ fi %doc AUTHORS NEWS FAQ README THANKS %{_bindir}/idn %{_mandir}/man1/idn.1* -%{_libdir}/libidn.so.11* +%{_libdir}/libidn.so.12* %{_infodir}/%{name}.info.gz %if %{with libidn_enables_emacs} %{_emacs_sitelispdir}/%{name} diff --git a/sources b/sources index cde9308..71a3d21 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libidn-1.34.tar.gz) = 1a9b5f2554d3953591b92010fa0fdedc438ca8bc31d2bc06c621eb5d423e81656607f09ac75bb02e1a5420459f69e82b5fb82987afa50db69793f9cd7a08365a +SHA512 (libidn-1.35.tar.gz) = 782260f73b1fd8ebea8a40e2b3a6866c4f67494b2b3df03748daa9c0f842a9578932e746eb4bbf2547fccb1d65d7fc99a7977759dbe58f87f2fdd26d0fe45a09 From 3b68e8825b493eb774423a9f15a40932778ecb5e Mon Sep 17 00:00:00 2001 From: Miroslav Lichvar Date: Tue, 15 May 2018 11:46:02 +0200 Subject: [PATCH 128/157] 1.35-1 --- libidn.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libidn.spec b/libidn.spec index d361966..eb8a93e 100644 --- a/libidn.spec +++ b/libidn.spec @@ -6,7 +6,7 @@ Summary: Internationalized Domain Name support library Name: libidn Version: 1.35 -Release: 3%{?dist} +Release: 1%{?dist} URL: http://www.gnu.org/software/libidn/ License: LGPLv2+ and GPLv3+ and GFDL Source0: http://ftp.gnu.org/gnu/libidn/libidn-%{version}.tar.gz @@ -201,6 +201,9 @@ fi %endif %changelog +* Tue May 15 2018 Miroslav Lichvar - 1.35-1 +- update to 1.35 + * Mon May 14 2018 Miroslav Lichvar - 1.34-3 - ignore install-info errors in post scriptlet (#1573966) From 5eeb56a699249aa49a267eaf0e845cd1a263e36f Mon Sep 17 00:00:00 2001 From: Miroslav Lichvar Date: Thu, 21 Jun 2018 11:46:34 +0200 Subject: [PATCH 129/157] drop obsolete fixes of info file --- libidn.spec | 6 ------ 1 file changed, 6 deletions(-) diff --git a/libidn.spec b/libidn.spec index eb8a93e..435de3d 100644 --- a/libidn.spec +++ b/libidn.spec @@ -91,12 +91,6 @@ find . -name '*.class' -print -delete %pom_remove_dep com.google.caliper:caliper java/pom.xml.in %endif -# Name directory sections consistently in the info file, #209491 -sed -i '/^INFO-DIR-SECTION/{s/GNU Libraries/Libraries/;s/GNU utilities/Utilities/;}' doc/libidn.info - -iconv -f ISO-8859-1 -t UTF-8 doc/libidn.info > iconv.tmp -mv iconv.tmp doc/libidn.info - %build %configure --disable-csharp --disable-static \ %if %{with libidn_enables_emacs} From e7f2a1fda611bc6c90416d2d35e63c2bf23f7cf9 Mon Sep 17 00:00:00 2001 From: Miroslav Lichvar Date: Thu, 21 Jun 2018 11:49:07 +0200 Subject: [PATCH 130/157] drop obsolete install-info scriptlets --- libidn.spec | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/libidn.spec b/libidn.spec index 435de3d..8fd30d3 100644 --- a/libidn.spec +++ b/libidn.spec @@ -24,8 +24,6 @@ BuildRequires: emacs %endif BuildRequires: pkgconfig BuildRequires: help2man -Requires(post): /sbin/install-info -Requires(preun): /sbin/install-info # gnulib is a copylib, bundling is allowed Provides: bundled(gnulib) %if %{with libidn_enables_emacs} @@ -156,16 +154,7 @@ rm -rf $RPM_BUILD_ROOT%{_javadir}/libidn*.jar %find_lang %{name} -%post -/sbin/install-info %{_infodir}/%{name}.info.gz %{_infodir}/dir || : -%?ldconfig - -%preun -if [ $1 = 0 ]; then - /sbin/install-info --delete %{_infodir}/%{name}.info.gz %{_infodir}/dir || : -fi - -%ldconfig_postun +%ldconfig_scriptlets %files -f %{name}.lang %{!?_licensedir:%global license %%doc} From 2501123fdfd28ee88b0d49f4ba2344cbc1449d6e Mon Sep 17 00:00:00 2001 From: Miroslav Lichvar Date: Thu, 21 Jun 2018 11:51:11 +0200 Subject: [PATCH 131/157] 1.35-2 --- libidn.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/libidn.spec b/libidn.spec index 8fd30d3..6ea633f 100644 --- a/libidn.spec +++ b/libidn.spec @@ -6,7 +6,7 @@ Summary: Internationalized Domain Name support library Name: libidn Version: 1.35 -Release: 1%{?dist} +Release: 2%{?dist} URL: http://www.gnu.org/software/libidn/ License: LGPLv2+ and GPLv3+ and GFDL Source0: http://ftp.gnu.org/gnu/libidn/libidn-%{version}.tar.gz @@ -184,6 +184,10 @@ rm -rf $RPM_BUILD_ROOT%{_javadir}/libidn*.jar %endif %changelog +* Thu Jun 21 2018 Miroslav Lichvar - 1.35-2 +- drop obsolete fixes of info file +- drop obsolete install-info scriptlets + * Tue May 15 2018 Miroslav Lichvar - 1.35-1 - update to 1.35 From 8164c9a1c624b0d668f5097cd118342bab613c62 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 13 Jul 2018 08:15:08 +0000 Subject: [PATCH 132/157] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- libidn.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libidn.spec b/libidn.spec index 6ea633f..46c1054 100644 --- a/libidn.spec +++ b/libidn.spec @@ -6,7 +6,7 @@ Summary: Internationalized Domain Name support library Name: libidn Version: 1.35 -Release: 2%{?dist} +Release: 3%{?dist} URL: http://www.gnu.org/software/libidn/ License: LGPLv2+ and GPLv3+ and GFDL Source0: http://ftp.gnu.org/gnu/libidn/libidn-%{version}.tar.gz @@ -184,6 +184,9 @@ rm -rf $RPM_BUILD_ROOT%{_javadir}/libidn*.jar %endif %changelog +* Fri Jul 13 2018 Fedora Release Engineering - 1.35-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Thu Jun 21 2018 Miroslav Lichvar - 1.35-2 - drop obsolete fixes of info file - drop obsolete install-info scriptlets From cdd3e214e9706ecc7b6daffb693f4675f2f9a6e3 Mon Sep 17 00:00:00 2001 From: "Owen W. Taylor" Date: Tue, 18 Sep 2018 20:18:53 +0000 Subject: [PATCH 133/157] Handle uncompressed info pages Make the spec file agnostic about whether info pages are compressed or not. --- libidn.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/libidn.spec b/libidn.spec index 46c1054..2e2d183 100644 --- a/libidn.spec +++ b/libidn.spec @@ -6,7 +6,7 @@ Summary: Internationalized Domain Name support library Name: libidn Version: 1.35 -Release: 3%{?dist} +Release: 4%{?dist} URL: http://www.gnu.org/software/libidn/ License: LGPLv2+ and GPLv3+ and GFDL Source0: http://ftp.gnu.org/gnu/libidn/libidn-%{version}.tar.gz @@ -163,7 +163,7 @@ rm -rf $RPM_BUILD_ROOT%{_javadir}/libidn*.jar %{_bindir}/idn %{_mandir}/man1/idn.1* %{_libdir}/libidn.so.12* -%{_infodir}/%{name}.info.gz +%{_infodir}/%{name}.info* %if %{with libidn_enables_emacs} %{_emacs_sitelispdir}/%{name} %endif @@ -184,6 +184,9 @@ rm -rf $RPM_BUILD_ROOT%{_javadir}/libidn*.jar %endif %changelog +* Tue Sep 18 2018 Owen Taylor - 1.35-4 +- Handle uncompressed info pages + * Fri Jul 13 2018 Fedora Release Engineering - 1.35-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From cd86e1a8a5b8fa94ea41d5710cb4c7a04c347d6c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 1 Feb 2019 07:21:31 +0000 Subject: [PATCH 134/157] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- libidn.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libidn.spec b/libidn.spec index 2e2d183..4f18139 100644 --- a/libidn.spec +++ b/libidn.spec @@ -6,7 +6,7 @@ Summary: Internationalized Domain Name support library Name: libidn Version: 1.35 -Release: 4%{?dist} +Release: 5%{?dist} URL: http://www.gnu.org/software/libidn/ License: LGPLv2+ and GPLv3+ and GFDL Source0: http://ftp.gnu.org/gnu/libidn/libidn-%{version}.tar.gz @@ -184,6 +184,9 @@ rm -rf $RPM_BUILD_ROOT%{_javadir}/libidn*.jar %endif %changelog +* Fri Feb 01 2019 Fedora Release Engineering - 1.35-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Tue Sep 18 2018 Owen Taylor - 1.35-4 - Handle uncompressed info pages From 3b010b12a208d3992f1c6e3fa92a574c367ccdac Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 25 Jul 2019 13:30:04 +0000 Subject: [PATCH 135/157] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- libidn.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libidn.spec b/libidn.spec index 4f18139..7eb6724 100644 --- a/libidn.spec +++ b/libidn.spec @@ -6,7 +6,7 @@ Summary: Internationalized Domain Name support library Name: libidn Version: 1.35 -Release: 5%{?dist} +Release: 6%{?dist} URL: http://www.gnu.org/software/libidn/ License: LGPLv2+ and GPLv3+ and GFDL Source0: http://ftp.gnu.org/gnu/libidn/libidn-%{version}.tar.gz @@ -184,6 +184,9 @@ rm -rf $RPM_BUILD_ROOT%{_javadir}/libidn*.jar %endif %changelog +* Thu Jul 25 2019 Fedora Release Engineering - 1.35-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Fri Feb 01 2019 Fedora Release Engineering - 1.35-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From 61e6c06288e97804543520a110a8921f08681a5c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 29 Jan 2020 09:23:09 +0000 Subject: [PATCH 136/157] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- libidn.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libidn.spec b/libidn.spec index 7eb6724..ede9daa 100644 --- a/libidn.spec +++ b/libidn.spec @@ -6,7 +6,7 @@ Summary: Internationalized Domain Name support library Name: libidn Version: 1.35 -Release: 6%{?dist} +Release: 7%{?dist} URL: http://www.gnu.org/software/libidn/ License: LGPLv2+ and GPLv3+ and GFDL Source0: http://ftp.gnu.org/gnu/libidn/libidn-%{version}.tar.gz @@ -184,6 +184,9 @@ rm -rf $RPM_BUILD_ROOT%{_javadir}/libidn*.jar %endif %changelog +* Wed Jan 29 2020 Fedora Release Engineering - 1.35-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Thu Jul 25 2019 Fedora Release Engineering - 1.35-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From 4dce31ec37c0775174b08b2f68290a4aafc66561 Mon Sep 17 00:00:00 2001 From: Miroslav Lichvar Date: Thu, 25 Jun 2020 14:51:24 +0200 Subject: [PATCH 137/157] fix build with JDK11 --- libidn-jar.patch | 29 +++++++++++++++++++++++++++++ libidn.spec | 3 +++ 2 files changed, 32 insertions(+) create mode 100644 libidn-jar.patch diff --git a/libidn-jar.patch b/libidn-jar.patch new file mode 100644 index 0000000..424d5e4 --- /dev/null +++ b/libidn-jar.patch @@ -0,0 +1,29 @@ +commit d19cfa1589ae4718b9f6d67a175d6e2868e4b8b8 +Author: Simon Josefsson +Date: Tue Apr 28 16:58:37 2020 +0200 + + Fix libidn.jar building with non-gcj. + +diff --git a/java/Makefile.am b/java/Makefile.am +index 1bb706fa..3d72989c 100644 +--- a/java/Makefile.am ++++ b/java/Makefile.am +@@ -46,16 +46,14 @@ libidn-$(VERSION).jar: + gnu/inet/encoding/Punycode.class \ + -C $(builddir)/src/main/java \ + gnu/inet/encoding/PunycodeException.class \ +- -C $(builddir)/src/main/java \ +- gnu/inet/encoding/RangeSet\$$1.class \ + -C $(builddir)/src/main/java \ + gnu/inet/encoding/RangeSet\$$Builder.class \ +- -C $(builddir)/src/main/java \ +- gnu/inet/encoding/RangeSet.class \ + -C $(builddir)/src/main/java \ + gnu/inet/encoding/RangeSet\$$Range.class \ + -C $(builddir)/src/main/java \ + gnu/inet/encoding/RangeSet\$$RangeContainsComparator.class \ ++ -C $(builddir)/src/main/java \ ++ gnu/inet/encoding/RangeSet.class \ + -C $(builddir)/src/main/java \ + gnu/inet/encoding/RFC3454.class \ + -C $(builddir)/src/main/java \ diff --git a/libidn.spec b/libidn.spec index ede9daa..2d9b561 100644 --- a/libidn.spec +++ b/libidn.spec @@ -12,6 +12,8 @@ License: LGPLv2+ and GPLv3+ and GFDL Source0: http://ftp.gnu.org/gnu/libidn/libidn-%{version}.tar.gz # Allow disabling Emacs support Patch0: libidn-1.33-Allow-disabling-Emacs-support.patch +# Fix build with JDK11 +Patch1: libidn-jar.patch BuildRequires: autoconf autoconf-archive BuildRequires: automake @@ -76,6 +78,7 @@ This package contains javadoc for %{name}-java. %prep %setup -q %patch0 -p1 +%patch1 -p1 autoreconf -vif # Prevent from regenerating sources by gengetopt because it's broken. touch src/idn_cmd.c src/idn_cmd.h From ec1de6c88096a85719fb6223b333e4adfc30b165 Mon Sep 17 00:00:00 2001 From: Miroslav Lichvar Date: Thu, 25 Jun 2020 14:51:44 +0200 Subject: [PATCH 138/157] 1.35-8 --- libidn.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libidn.spec b/libidn.spec index 2d9b561..a9fe339 100644 --- a/libidn.spec +++ b/libidn.spec @@ -6,7 +6,7 @@ Summary: Internationalized Domain Name support library Name: libidn Version: 1.35 -Release: 7%{?dist} +Release: 8%{?dist} URL: http://www.gnu.org/software/libidn/ License: LGPLv2+ and GPLv3+ and GFDL Source0: http://ftp.gnu.org/gnu/libidn/libidn-%{version}.tar.gz @@ -187,6 +187,9 @@ rm -rf $RPM_BUILD_ROOT%{_javadir}/libidn*.jar %endif %changelog +* Thu Jun 25 2020 Miroslav Lichvar - 1.35-8 +- fix build with JDK11 + * Wed Jan 29 2020 Fedora Release Engineering - 1.35-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild From cec968cfebe0053fa3c383e8d50782f0aef85342 Mon Sep 17 00:00:00 2001 From: Jiri Date: Sat, 11 Jul 2020 02:10:00 +0200 Subject: [PATCH 139/157] Rebuilt for JDK-11 --- libidn.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libidn.spec b/libidn.spec index a9fe339..a9530be 100644 --- a/libidn.spec +++ b/libidn.spec @@ -6,7 +6,7 @@ Summary: Internationalized Domain Name support library Name: libidn Version: 1.35 -Release: 8%{?dist} +Release: 9%{?dist} URL: http://www.gnu.org/software/libidn/ License: LGPLv2+ and GPLv3+ and GFDL Source0: http://ftp.gnu.org/gnu/libidn/libidn-%{version}.tar.gz @@ -187,6 +187,9 @@ rm -rf $RPM_BUILD_ROOT%{_javadir}/libidn*.jar %endif %changelog +* Sat Jul 11 2020 Jiri Vanek - 1.35-9 +- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 + * Thu Jun 25 2020 Miroslav Lichvar - 1.35-8 - fix build with JDK11 From 1d065f049e9b7926ff432eee8e3e9043d94ff699 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 28 Jul 2020 04:51:16 +0000 Subject: [PATCH 140/157] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- libidn.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libidn.spec b/libidn.spec index a9530be..47ed6cc 100644 --- a/libidn.spec +++ b/libidn.spec @@ -6,7 +6,7 @@ Summary: Internationalized Domain Name support library Name: libidn Version: 1.35 -Release: 9%{?dist} +Release: 10%{?dist} URL: http://www.gnu.org/software/libidn/ License: LGPLv2+ and GPLv3+ and GFDL Source0: http://ftp.gnu.org/gnu/libidn/libidn-%{version}.tar.gz @@ -187,6 +187,9 @@ rm -rf $RPM_BUILD_ROOT%{_javadir}/libidn*.jar %endif %changelog +* Tue Jul 28 2020 Fedora Release Engineering - 1.35-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Sat Jul 11 2020 Jiri Vanek - 1.35-9 - Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 From 0bddcbb398a28475c494cb1aada54a5ab9deed6d Mon Sep 17 00:00:00 2001 From: Miroslav Lichvar Date: Tue, 28 Jul 2020 08:54:55 +0200 Subject: [PATCH 141/157] update to 1.36 --- .gitignore | 2 +- libidn-jar.patch | 29 ----------------------------- libidn.spec | 5 +---- sources | 2 +- 4 files changed, 3 insertions(+), 35 deletions(-) delete mode 100644 libidn-jar.patch diff --git a/.gitignore b/.gitignore index 6fbf1fe..dbe8c37 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ /libidn-1.?? -/libidn-1.35.tar.gz +/libidn-1.36.tar.gz diff --git a/libidn-jar.patch b/libidn-jar.patch deleted file mode 100644 index 424d5e4..0000000 --- a/libidn-jar.patch +++ /dev/null @@ -1,29 +0,0 @@ -commit d19cfa1589ae4718b9f6d67a175d6e2868e4b8b8 -Author: Simon Josefsson -Date: Tue Apr 28 16:58:37 2020 +0200 - - Fix libidn.jar building with non-gcj. - -diff --git a/java/Makefile.am b/java/Makefile.am -index 1bb706fa..3d72989c 100644 ---- a/java/Makefile.am -+++ b/java/Makefile.am -@@ -46,16 +46,14 @@ libidn-$(VERSION).jar: - gnu/inet/encoding/Punycode.class \ - -C $(builddir)/src/main/java \ - gnu/inet/encoding/PunycodeException.class \ -- -C $(builddir)/src/main/java \ -- gnu/inet/encoding/RangeSet\$$1.class \ - -C $(builddir)/src/main/java \ - gnu/inet/encoding/RangeSet\$$Builder.class \ -- -C $(builddir)/src/main/java \ -- gnu/inet/encoding/RangeSet.class \ - -C $(builddir)/src/main/java \ - gnu/inet/encoding/RangeSet\$$Range.class \ - -C $(builddir)/src/main/java \ - gnu/inet/encoding/RangeSet\$$RangeContainsComparator.class \ -+ -C $(builddir)/src/main/java \ -+ gnu/inet/encoding/RangeSet.class \ - -C $(builddir)/src/main/java \ - gnu/inet/encoding/RFC3454.class \ - -C $(builddir)/src/main/java \ diff --git a/libidn.spec b/libidn.spec index 47ed6cc..d1550f2 100644 --- a/libidn.spec +++ b/libidn.spec @@ -5,15 +5,13 @@ Summary: Internationalized Domain Name support library Name: libidn -Version: 1.35 +Version: 1.36 Release: 10%{?dist} URL: http://www.gnu.org/software/libidn/ License: LGPLv2+ and GPLv3+ and GFDL Source0: http://ftp.gnu.org/gnu/libidn/libidn-%{version}.tar.gz # Allow disabling Emacs support Patch0: libidn-1.33-Allow-disabling-Emacs-support.patch -# Fix build with JDK11 -Patch1: libidn-jar.patch BuildRequires: autoconf autoconf-archive BuildRequires: automake @@ -78,7 +76,6 @@ This package contains javadoc for %{name}-java. %prep %setup -q %patch0 -p1 -%patch1 -p1 autoreconf -vif # Prevent from regenerating sources by gengetopt because it's broken. touch src/idn_cmd.c src/idn_cmd.h diff --git a/sources b/sources index 71a3d21..8b3c430 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libidn-1.35.tar.gz) = 782260f73b1fd8ebea8a40e2b3a6866c4f67494b2b3df03748daa9c0f842a9578932e746eb4bbf2547fccb1d65d7fc99a7977759dbe58f87f2fdd26d0fe45a09 +SHA512 (libidn-1.36.tar.gz) = 0d66e10bf7a8de4b27f692a427d2c8e901b8bed73b0a36268d8f939205df81f6a30f0634fd3b87370d4e81c1327c0b10391fa122a0a5459c32a3541b8a2149ad From 10edfd1aad8d54c87e826a3a423f776c540b358e Mon Sep 17 00:00:00 2001 From: Miroslav Lichvar Date: Tue, 28 Jul 2020 09:11:56 +0200 Subject: [PATCH 142/157] 1.36-1 --- libidn.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libidn.spec b/libidn.spec index d1550f2..d6bad40 100644 --- a/libidn.spec +++ b/libidn.spec @@ -6,7 +6,7 @@ Summary: Internationalized Domain Name support library Name: libidn Version: 1.36 -Release: 10%{?dist} +Release: 1%{?dist} URL: http://www.gnu.org/software/libidn/ License: LGPLv2+ and GPLv3+ and GFDL Source0: http://ftp.gnu.org/gnu/libidn/libidn-%{version}.tar.gz @@ -184,6 +184,9 @@ rm -rf $RPM_BUILD_ROOT%{_javadir}/libidn*.jar %endif %changelog +* Tue Jul 28 2020 Miroslav Lichvar - 1.36-1 +- update to 1.36 + * Tue Jul 28 2020 Fedora Release Engineering - 1.35-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From 658eb65656b122e349c235ee1692451a2ed084ef Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Tue, 5 Jan 2021 02:00:53 +0000 Subject: [PATCH 143/157] Add BuildRequires: make https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot --- libidn.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/libidn.spec b/libidn.spec index d6bad40..2dcc6cd 100644 --- a/libidn.spec +++ b/libidn.spec @@ -56,6 +56,7 @@ BuildRequires: javapackages-local BuildRequires: mvn(com.google.code.findbugs:annotations) BuildRequires: mvn(com.google.guava:guava) BuildRequires: mvn(junit:junit) +BuildRequires: make BuildArch: noarch %description java From 68205d88b6cc7df1fb7f4520fe7af9b2c3e50659 Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Mon, 13 Jul 2020 21:03:58 +0000 Subject: [PATCH 144/157] Use make macros https://fedoraproject.org/wiki/Changes/UseMakeBuildInstallMacro --- libidn.spec | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libidn.spec b/libidn.spec index 2dcc6cd..a574eb9 100644 --- a/libidn.spec +++ b/libidn.spec @@ -111,22 +111,22 @@ sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool # without RPATH this needs to be set for idn executed by help2man export LD_LIBRARY_PATH=$(pwd)/lib/.libs -make %{?_smp_mflags} V=1 +%make_build %check # without RPATH this needs to be set to test the compiled library export LD_LIBRARY_PATH=$(pwd)/lib/.libs -make %{?_smp_mflags} -C tests check VALGRIND=env +%make_build -C tests check VALGRIND=env %install -make install DESTDIR=$RPM_BUILD_ROOT pkgconfigdir=%{_libdir}/pkgconfig \ +%make_install pkgconfigdir=%{_libdir}/pkgconfig \ %if %{with libidn_enables_java} libidn_jardir=%{_javadir} \ %endif ; # provide more examples -make %{?_smp_mflags} -C examples distclean +%make_build -C examples distclean # clean up docs find doc -name "Makefile*" | xargs rm From 44cbc00ed73fb440a59f99cb535c4b42fe14de45 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 26 Jan 2021 17:16:08 +0000 Subject: [PATCH 145/157] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- libidn.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libidn.spec b/libidn.spec index a574eb9..ac8d511 100644 --- a/libidn.spec +++ b/libidn.spec @@ -6,7 +6,7 @@ Summary: Internationalized Domain Name support library Name: libidn Version: 1.36 -Release: 1%{?dist} +Release: 2%{?dist} URL: http://www.gnu.org/software/libidn/ License: LGPLv2+ and GPLv3+ and GFDL Source0: http://ftp.gnu.org/gnu/libidn/libidn-%{version}.tar.gz @@ -185,6 +185,9 @@ rm -rf $RPM_BUILD_ROOT%{_javadir}/libidn*.jar %endif %changelog +* Tue Jan 26 2021 Fedora Release Engineering - 1.36-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Tue Jul 28 2020 Miroslav Lichvar - 1.36-1 - update to 1.36 From ac05fab0b18e803453ee39967eca9d214352c105 Mon Sep 17 00:00:00 2001 From: Miroslav Lichvar Date: Thu, 25 Mar 2021 14:51:03 +0100 Subject: [PATCH 146/157] add gtk-doc to build requirements (#1942967) --- libidn.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/libidn.spec b/libidn.spec index ac8d511..be735c9 100644 --- a/libidn.spec +++ b/libidn.spec @@ -19,6 +19,7 @@ BuildRequires: libtool BuildRequires: texinfo BuildRequires: gcc BuildRequires: gettext gettext-devel +BuildRequires: gtk-doc %if %{with libidn_enables_emacs} BuildRequires: emacs %endif From 63a600a7bb5ef55feb3389f3ce3150272c1c32a7 Mon Sep 17 00:00:00 2001 From: Miroslav Lichvar Date: Mon, 17 May 2021 12:32:05 +0200 Subject: [PATCH 147/157] update to 1.37 --- .gitignore | 2 +- ...abling-Emacs-support.patch => libidn-emacsopt.patch | 10 +++++----- libidn.spec | 8 ++++---- sources | 2 +- 4 files changed, 11 insertions(+), 11 deletions(-) rename libidn-1.33-Allow-disabling-Emacs-support.patch => libidn-emacsopt.patch (89%) diff --git a/.gitignore b/.gitignore index dbe8c37..1c986a6 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ /libidn-1.?? -/libidn-1.36.tar.gz +/libidn-1.37.tar.gz diff --git a/libidn-1.33-Allow-disabling-Emacs-support.patch b/libidn-emacsopt.patch similarity index 89% rename from libidn-1.33-Allow-disabling-Emacs-support.patch rename to libidn-emacsopt.patch index 2c7189b..c171815 100644 --- a/libidn-1.33-Allow-disabling-Emacs-support.patch +++ b/libidn-emacsopt.patch @@ -19,14 +19,14 @@ diff --git a/configure.ac b/configure.ac index 649ddcd..a6dc9ff 100644 --- a/configure.ac +++ b/configure.ac -@@ -50,7 +50,6 @@ AM_MISSING_PROG(HELP2MAN, help2man, $missing_dir) - AM_GNU_GETTEXT(external) - AM_GNU_GETTEXT_VERSION(0.19.3) +@@ -51,7 +51,6 @@ LT_INIT([win32-dll]) + AM_MISSING_PROG(PERL, perl, $missing_dir) + AM_MISSING_PROG(HELP2MAN, help2man, $missing_dir) AM_ICONV -AM_PATH_LISPDIR - if test "$am_cv_func_iconv" != "yes"; then - AC_MSG_NOTICE([ + AM_GNU_GETTEXT([external]) + AM_GNU_GETTEXT_VERSION([0.19.3]) @@ -100,6 +99,14 @@ AM_CONDITIONAL(JAVA, test "$enable_java" != "no") AC_MSG_CHECKING([if implementation in Java should be built]) AC_MSG_RESULT($enable_java) diff --git a/libidn.spec b/libidn.spec index be735c9..fe71e74 100644 --- a/libidn.spec +++ b/libidn.spec @@ -5,13 +5,13 @@ Summary: Internationalized Domain Name support library Name: libidn -Version: 1.36 +Version: 1.37 Release: 2%{?dist} URL: http://www.gnu.org/software/libidn/ License: LGPLv2+ and GPLv3+ and GFDL Source0: http://ftp.gnu.org/gnu/libidn/libidn-%{version}.tar.gz # Allow disabling Emacs support -Patch0: libidn-1.33-Allow-disabling-Emacs-support.patch +Patch0: libidn-emacsopt.patch BuildRequires: autoconf autoconf-archive BuildRequires: automake @@ -77,7 +77,7 @@ This package contains javadoc for %{name}-java. %prep %setup -q -%patch0 -p1 +%patch0 -p1 -b .emacsopt autoreconf -vif # Prevent from regenerating sources by gengetopt because it's broken. touch src/idn_cmd.c src/idn_cmd.h @@ -171,7 +171,7 @@ rm -rf $RPM_BUILD_ROOT%{_javadir}/libidn*.jar %endif %files devel -%doc doc/libidn.html examples +%doc examples %{_libdir}/libidn.so %{_includedir}/*.h %{_libdir}/pkgconfig/*.pc diff --git a/sources b/sources index 8b3c430..d9e4477 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libidn-1.36.tar.gz) = 0d66e10bf7a8de4b27f692a427d2c8e901b8bed73b0a36268d8f939205df81f6a30f0634fd3b87370d4e81c1327c0b10391fa122a0a5459c32a3541b8a2149ad +SHA512 (libidn-1.37.tar.gz) = 198a5b2f0db3ad076e3726dda7f197835dd93a126ee796c138185abd09ee2f828042225dd570fa19b58b3e81b120daf929f348a55f9a536c546dd3311c29e27c From 33fd266a4dd7443c63df74070d7e77152a73c592 Mon Sep 17 00:00:00 2001 From: Miroslav Lichvar Date: Mon, 17 May 2021 12:35:50 +0200 Subject: [PATCH 148/157] 1.37-1 --- libidn.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/libidn.spec b/libidn.spec index fe71e74..e007a3a 100644 --- a/libidn.spec +++ b/libidn.spec @@ -6,7 +6,7 @@ Summary: Internationalized Domain Name support library Name: libidn Version: 1.37 -Release: 2%{?dist} +Release: 1%{?dist} URL: http://www.gnu.org/software/libidn/ License: LGPLv2+ and GPLv3+ and GFDL Source0: http://ftp.gnu.org/gnu/libidn/libidn-%{version}.tar.gz @@ -186,8 +186,12 @@ rm -rf $RPM_BUILD_ROOT%{_javadir}/libidn*.jar %endif %changelog +* Mon May 17 2021 Miroslav Lichvar - 1.37-1 +- update to 1.37 + * Tue Jan 26 2021 Fedora Release Engineering - 1.36-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild +- add gtk-doc to build requirements (#1942967) * Tue Jul 28 2020 Miroslav Lichvar - 1.36-1 - update to 1.36 From ce64fe16ac1b3286422354dbcb4dc3265c9d7d7b Mon Sep 17 00:00:00 2001 From: Richard Fearn Date: Tue, 1 Jun 2021 21:30:33 +0100 Subject: [PATCH 149/157] Remove unnecessary findbugs dependency (#1966769) --- libidn.spec | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/libidn.spec b/libidn.spec index e007a3a..4b61a69 100644 --- a/libidn.spec +++ b/libidn.spec @@ -6,7 +6,7 @@ Summary: Internationalized Domain Name support library Name: libidn Version: 1.37 -Release: 1%{?dist} +Release: 2%{?dist} URL: http://www.gnu.org/software/libidn/ License: LGPLv2+ and GPLv3+ and GFDL Source0: http://ftp.gnu.org/gnu/libidn/libidn-%{version}.tar.gz @@ -54,7 +54,6 @@ developing programs which use the GNU libidn library. Summary: Java port of the GNU Libidn library BuildRequires: java-devel BuildRequires: javapackages-local -BuildRequires: mvn(com.google.code.findbugs:annotations) BuildRequires: mvn(com.google.guava:guava) BuildRequires: mvn(junit:junit) BuildRequires: make @@ -89,6 +88,9 @@ find . -name '*.class' -print -delete %if %{with libidn_enables_java} # Not available test dep %pom_remove_dep com.google.caliper:caliper java/pom.xml.in + +# Unused dependency +%pom_remove_dep com.google.code.findbugs:annotations java/pom.xml.in %endif %build @@ -186,6 +188,9 @@ rm -rf $RPM_BUILD_ROOT%{_javadir}/libidn*.jar %endif %changelog +* Tue Jun 01 2021 Richard Fearn - 1.37-2 +- Remove unnecessary findbugs dependency (#1966769) + * Mon May 17 2021 Miroslav Lichvar - 1.37-1 - update to 1.37 From 350a59cab160328f701d5fb9b215a1ca01e98e23 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 22 Jul 2021 11:35:34 +0000 Subject: [PATCH 150/157] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- libidn.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libidn.spec b/libidn.spec index 4b61a69..a44ff8c 100644 --- a/libidn.spec +++ b/libidn.spec @@ -6,7 +6,7 @@ Summary: Internationalized Domain Name support library Name: libidn Version: 1.37 -Release: 2%{?dist} +Release: 3%{?dist} URL: http://www.gnu.org/software/libidn/ License: LGPLv2+ and GPLv3+ and GFDL Source0: http://ftp.gnu.org/gnu/libidn/libidn-%{version}.tar.gz @@ -188,6 +188,9 @@ rm -rf $RPM_BUILD_ROOT%{_javadir}/libidn*.jar %endif %changelog +* Thu Jul 22 2021 Fedora Release Engineering - 1.37-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Tue Jun 01 2021 Richard Fearn - 1.37-2 - Remove unnecessary findbugs dependency (#1966769) From 157a852d718b0ffd353211d56ef85fa55ea29067 Mon Sep 17 00:00:00 2001 From: Miroslav Lichvar Date: Mon, 26 Jul 2021 12:28:17 +0200 Subject: [PATCH 151/157] update to 1.38 --- .gitignore | 2 +- libidn.spec | 2 +- sources | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 1c986a6..1dc3148 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ /libidn-1.?? -/libidn-1.37.tar.gz +/libidn-1.38.tar.gz diff --git a/libidn.spec b/libidn.spec index a44ff8c..eb6e629 100644 --- a/libidn.spec +++ b/libidn.spec @@ -5,7 +5,7 @@ Summary: Internationalized Domain Name support library Name: libidn -Version: 1.37 +Version: 1.38 Release: 3%{?dist} URL: http://www.gnu.org/software/libidn/ License: LGPLv2+ and GPLv3+ and GFDL diff --git a/sources b/sources index d9e4477..4ac4303 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libidn-1.37.tar.gz) = 198a5b2f0db3ad076e3726dda7f197835dd93a126ee796c138185abd09ee2f828042225dd570fa19b58b3e81b120daf929f348a55f9a536c546dd3311c29e27c +SHA512 (libidn-1.38.tar.gz) = 5e59b2263fde44d1463b47b516347b17a4e3e3696ebba66ab5fe464d567e2ec81f769fa7cf72ed51cfb501e32221813bb375373713a47e2f599fc6122850e419 From 0f215208d2f0f3970e1cfbd988faa67e5f22b15b Mon Sep 17 00:00:00 2001 From: Miroslav Lichvar Date: Mon, 26 Jul 2021 12:28:39 +0200 Subject: [PATCH 152/157] 1.38-1 --- libidn.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libidn.spec b/libidn.spec index eb6e629..0199a13 100644 --- a/libidn.spec +++ b/libidn.spec @@ -6,7 +6,7 @@ Summary: Internationalized Domain Name support library Name: libidn Version: 1.38 -Release: 3%{?dist} +Release: 1%{?dist} URL: http://www.gnu.org/software/libidn/ License: LGPLv2+ and GPLv3+ and GFDL Source0: http://ftp.gnu.org/gnu/libidn/libidn-%{version}.tar.gz @@ -188,6 +188,9 @@ rm -rf $RPM_BUILD_ROOT%{_javadir}/libidn*.jar %endif %changelog +* Mon Jul 26 2021 Miroslav Lichvar - 1.38-1 +- update to 1.38 + * Thu Jul 22 2021 Fedora Release Engineering - 1.37-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From 82e7a188d80bfb50f5c1541a32fb3d00f25fc2c6 Mon Sep 17 00:00:00 2001 From: Miroslav Lichvar Date: Thu, 2 Dec 2021 17:17:36 +0100 Subject: [PATCH 153/157] fix building with new java --- libidn.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libidn.spec b/libidn.spec index 0199a13..e5ec4f3 100644 --- a/libidn.spec +++ b/libidn.spec @@ -148,7 +148,7 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la \ %if %{with libidn_enables_java} # regenerate java documentation rm -rf doc/java/* -%javadoc -source 1.6 -d doc/java $(find java/src/main/java -name "*.java") +%javadoc -d doc/java $(find java/src/main/java -name "*.java") # generate maven depmap rm -rf $RPM_BUILD_ROOT%{_javadir}/libidn*.jar %mvn_artifact java/pom.xml java/libidn-%{version}.jar From f82fe5c75660f457b69489ac720c6d49a66e983a Mon Sep 17 00:00:00 2001 From: Miroslav Lichvar Date: Thu, 2 Dec 2021 17:20:25 +0100 Subject: [PATCH 154/157] 1.38-2 --- libidn.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libidn.spec b/libidn.spec index e5ec4f3..4b717ca 100644 --- a/libidn.spec +++ b/libidn.spec @@ -6,7 +6,7 @@ Summary: Internationalized Domain Name support library Name: libidn Version: 1.38 -Release: 1%{?dist} +Release: 2%{?dist} URL: http://www.gnu.org/software/libidn/ License: LGPLv2+ and GPLv3+ and GFDL Source0: http://ftp.gnu.org/gnu/libidn/libidn-%{version}.tar.gz @@ -188,6 +188,9 @@ rm -rf $RPM_BUILD_ROOT%{_javadir}/libidn*.jar %endif %changelog +* Thu Dec 02 2021 Miroslav Lichvar - 1.38-2 +- fix building with new java + * Mon Jul 26 2021 Miroslav Lichvar - 1.38-1 - update to 1.38 From aaa6b8065d20a55fa6a4b5c991a0cb39b8ca2810 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jan 2022 16:26:26 +0000 Subject: [PATCH 155/157] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- libidn.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libidn.spec b/libidn.spec index 4b717ca..9bfa5da 100644 --- a/libidn.spec +++ b/libidn.spec @@ -6,7 +6,7 @@ Summary: Internationalized Domain Name support library Name: libidn Version: 1.38 -Release: 2%{?dist} +Release: 3%{?dist} URL: http://www.gnu.org/software/libidn/ License: LGPLv2+ and GPLv3+ and GFDL Source0: http://ftp.gnu.org/gnu/libidn/libidn-%{version}.tar.gz @@ -188,6 +188,9 @@ rm -rf $RPM_BUILD_ROOT%{_javadir}/libidn*.jar %endif %changelog +* Thu Jan 20 2022 Fedora Release Engineering - 1.38-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Thu Dec 02 2021 Miroslav Lichvar - 1.38-2 - fix building with new java From 5e22c0709c9cf94d96aff1b5a40e0c4d27efc871 Mon Sep 17 00:00:00 2001 From: Jiri Date: Sat, 5 Feb 2022 22:21:36 +0100 Subject: [PATCH 156/157] Rebuilt for java-17-openjdk as system jdk https://fedoraproject.org/wiki/Changes/Java17 --- libidn.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libidn.spec b/libidn.spec index 9bfa5da..05618d0 100644 --- a/libidn.spec +++ b/libidn.spec @@ -6,7 +6,7 @@ Summary: Internationalized Domain Name support library Name: libidn Version: 1.38 -Release: 3%{?dist} +Release: 4%{?dist} URL: http://www.gnu.org/software/libidn/ License: LGPLv2+ and GPLv3+ and GFDL Source0: http://ftp.gnu.org/gnu/libidn/libidn-%{version}.tar.gz @@ -188,6 +188,9 @@ rm -rf $RPM_BUILD_ROOT%{_javadir}/libidn*.jar %endif %changelog +* Sat Feb 05 2022 Jiri Vanek - 1.38-4 +- Rebuilt for java-17-openjdk as system jdk + * Thu Jan 20 2022 Fedora Release Engineering - 1.38-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From 6fc952ec90c1242d44ce024fefd5ff327ef8916a Mon Sep 17 00:00:00 2001 From: MSVSphere Packaging Team Date: Mon, 30 Oct 2023 23:07:26 +0300 Subject: [PATCH 157/157] Remove unnecessary files --- sources | 1 - 1 file changed, 1 deletion(-) delete mode 100644 sources diff --git a/sources b/sources deleted file mode 100644 index 4ac4303..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -SHA512 (libidn-1.38.tar.gz) = 5e59b2263fde44d1463b47b516347b17a4e3e3696ebba66ab5fe464d567e2ec81f769fa7cf72ed51cfb501e32221813bb375373713a47e2f599fc6122850e419