From 0d7379a25312a38d8cea122c2012b595541f1bcf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Thu, 3 Oct 2019 14:39:27 +0200 Subject: [PATCH 01/44] Rebuilt for Python 3.8.0rc1 (#1748018) --- thrift.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/thrift.spec b/thrift.spec index 6883df4..ef37416 100644 --- a/thrift.spec +++ b/thrift.spec @@ -59,7 +59,7 @@ Name: thrift Version: 0.10.0 -Release: 19%{?dist} +Release: 20%{?dist} Summary: Software framework for cross-language services development # Parts of the source are used under the BSD and zlib licenses, but @@ -558,6 +558,9 @@ find %{buildroot} -name \*.py -exec grep -q /usr/bin/env {} \; -print | xargs -r %endif %changelog +* Thu Oct 03 2019 Miro Hrončok - 0.10.0-20 +- Rebuilt for Python 3.8.0rc1 (#1748018) + * Tue Aug 20 2019 Christopher Tubbs - 0.10.0-19 - Fix FTBFS (by removing Java support) and fix Python3 issues (rhbz#1738810 and rhbz#1533306) From 4242bafd94183a06361373e6f5f4c9d7e2a32bc5 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Sun, 1 Dec 2019 20:56:42 -0700 Subject: [PATCH 02/44] - Update to 0.13.0 (bz#1778343) - Drops fb303 package - Switch to Qt5 --- .gitignore | 1 + THRIFT-4177.patch | 27 ------ bootstrap.sh | 14 +++- fb303-0.10.0-buildxml.patch | 158 ------------------------------------ fix-ppc64le-builds.patch | 13 --- libfb303-0.10.0.pom | 104 ------------------------ sources | 2 +- thrift.spec | 153 ++++------------------------------ 8 files changed, 29 insertions(+), 443 deletions(-) delete mode 100644 THRIFT-4177.patch delete mode 100644 fb303-0.10.0-buildxml.patch delete mode 100644 fix-ppc64le-builds.patch delete mode 100644 libfb303-0.10.0.pom diff --git a/.gitignore b/.gitignore index f5a770c..618bab6 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /0.9.1.tar.gz /thrift-0.10.0.tar.gz +/thrift-0.13.0.tar.gz diff --git a/THRIFT-4177.patch b/THRIFT-4177.patch deleted file mode 100644 index c0c331b..0000000 --- a/THRIFT-4177.patch +++ /dev/null @@ -1,27 +0,0 @@ -diff --git a/compiler/cpp/src/thrift/generate/t_java_generator.cc b/compiler/cpp/src/thrift/generate/t_java_generator.cc -index fb581e4..90dfa06 100644 ---- a/compiler/cpp/src/thrift/generate/t_java_generator.cc -+++ b/compiler/cpp/src/thrift/generate/t_java_generator.cc -@@ -4657,8 +4657,9 @@ void t_java_generator::generate_deep_copy_non_container(ofstream& out, - std::string dest_name, - t_type* type) { - (void)dest_name; -+ type = get_true_type(type); - if (type->is_base_type() || type->is_enum() || type->is_typedef()) { -- if (((t_base_type*)type)->is_binary()) { -+ if (type->is_binary()) { - out << "org.apache.thrift.TBaseHelper.copyBinary(" << source_name << ")"; - } else { - // everything else can be copied directly -diff --git a/compiler/cpp/src/thrift/parse/t_type.h b/compiler/cpp/src/thrift/parse/t_type.h -index 30f8c1f7..3a6d1e04 100644 ---- a/compiler/cpp/src/thrift/parse/t_type.h -+++ b/compiler/cpp/src/thrift/parse/t_type.h -@@ -47,6 +47,7 @@ public: - virtual bool is_void() const { return false; } - virtual bool is_base_type() const { return false; } - virtual bool is_string() const { return false; } -+ virtual bool is_binary() const { return false; } - virtual bool is_bool() const { return false; } - virtual bool is_typedef() const { return false; } - virtual bool is_enum() const { return false; } diff --git a/bootstrap.sh b/bootstrap.sh index 52ecda4..1989437 100644 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -19,7 +19,10 @@ # under the License. # -./cleanup.sh +echo -n "make distclean... " +make -k distclean >/dev/null 2>&1 +echo "ok" + if test -d lib/php/src/ext/thrift_protocol ; then if phpize -v >/dev/null 2>/dev/null ; then (cd lib/php/src/ext/thrift_protocol && phpize) @@ -38,17 +41,24 @@ else exit 1 fi +format_version () { + printf "%03d%03d%03d%03d" $(echo $1 | tr '.' ' '); +} + # we require automake 1.13 or later # check must happen externally due to use of newer macro AUTOMAKE_VERSION=`automake --version | grep automake | egrep -o '([0-9]{1,}\.)+[0-9]{1,}'` -if [ "$AUTOMAKE_VERSION" \< "1.13" ]; then +if [ $(format_version $AUTOMAKE_VERSION) -lt $(format_version 1.13) ]; then echo >&2 "automake version $AUTOMAKE_VERSION is too old (need 1.13 or later)" exit 1 fi +set -e autoscan $LIBTOOLIZE --copy --automake aclocal -I ./aclocal autoheader +sed '/undef VERSION/d' config.hin > config.hin2 +mv config.hin2 config.hin autoconf automake --copy --add-missing --foreign diff --git a/fb303-0.10.0-buildxml.patch b/fb303-0.10.0-buildxml.patch deleted file mode 100644 index eb3825a..0000000 --- a/fb303-0.10.0-buildxml.patch +++ /dev/null @@ -1,158 +0,0 @@ -diff --git a/contrib/fb303/java/build.xml b/contrib/fb303/java/build.xml -index 8f2fa51..d89f05e 100755 ---- a/contrib/fb303/java/build.xml -+++ b/contrib/fb303/java/build.xml -@@ -17,8 +17,7 @@ - specific language governing permissions and limitations - under the License. - --> -- -+ - - - -@@ -38,8 +37,8 @@ - - - -- -- -+ -+ - - - -@@ -50,7 +49,7 @@ - - - -- -+ - - - -@@ -72,13 +71,21 @@ - - - -- -+ - - -- -- -- -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ - -+ - - - -@@ -99,97 +106,4 @@ - - - -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- - diff --git a/fix-ppc64le-builds.patch b/fix-ppc64le-builds.patch deleted file mode 100644 index f56ad86..0000000 --- a/fix-ppc64le-builds.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/aclocal/ax_boost_base.m4 b/aclocal/ax_boost_base.m4 -index b496020..30ee0df 100644 ---- a/aclocal/ax_boost_base.m4 -+++ b/aclocal/ax_boost_base.m4 -@@ -92,7 +92,7 @@ if test "x$want_boost" = "xyes"; then - libsubdirs="lib" - ax_arch=`uname -m` - case $ax_arch in -- x86_64|ppc64|s390x|sparc64|aarch64) -+ x86_64|ppc64|ppc64le|s390x|sparc64|aarch64) - libsubdirs="lib64 lib lib64" - ;; - esac diff --git a/libfb303-0.10.0.pom b/libfb303-0.10.0.pom deleted file mode 100644 index c3fddde..0000000 --- a/libfb303-0.10.0.pom +++ /dev/null @@ -1,104 +0,0 @@ - - - 4.0.0 - org.apache.thrift - libfb303 - 0.10.0 - pom - Apache Thrift - Thrift is a software framework for scalable cross-language services development. - http://thrift.apache.org - - - The Apache Software License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0.txt - - - - - mcslee - Mark Slee - - - dreiss - David Reiss - - - aditya - Aditya Agarwal - - - marck - Marc Kwiatkowski - - - jwang - James Wang - - - cpiro - Chris Piro - - - bmaurer - Ben Maurer - - - kclark - Kevin Clark - - - jake - Jake Luciani - - - bryanduxbury - Bryan Duxbury - - - esteve - Esteve Fernandez - - - todd - Todd Lipcon - - - geechorama - Andrew McGeachie - - - molinaro - Anthony Molinaro - - - roger - Roger Meier - - - jfarrell - Jake Farrell - - - jensg - Jens Geyer - - - carl - Carl Yeksigian - - - - scm:git:https://git-wip-us.apache.org/repos/asf/thrift.git - scm:git:https://git-wip-us.apache.org/repos/asf/thrift.git - https://git-wip-us.apache.org/repos/asf?p=thrift.git - - - - org.apache.thrift - libthrift - 0.10.0 - - - diff --git a/sources b/sources index f7d47e8..63b1dcc 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (thrift-0.10.0.tar.gz) = 3695cf0fb0e4080b02446ab694fb61476997d8b181942dd6fe1e3e7cf0dcf990b4184ea33f9d0bc290b96200f702cf1ac1579e36b6b5bfe9ba8914b2d2938ddc +SHA512 (thrift-0.13.0.tar.gz) = 5f7426d1e429ead20dd366f63a6d619071eccc17dc0395738307eef507b703733d029147fb596c4d392d31dc822777ea2a0be709f1f677b1221c9335cfcb09b7 diff --git a/thrift.spec b/thrift.spec index ef37416..d42fbde 100644 --- a/thrift.spec +++ b/thrift.spec @@ -58,8 +58,8 @@ %global golang_configure --without-go Name: thrift -Version: 0.10.0 -Release: 20%{?dist} +Version: 0.13.0 +Release: 1%{?dist} Summary: Software framework for cross-language services development # Parts of the source are used under the BSD and zlib licenses, but @@ -77,21 +77,10 @@ Source0: https://archive.apache.org/dist/%{name}/%{version}/%{name}-%{version}.t Source1: https://repo1.maven.org/maven2/org/apache/thrift/lib%{name}/%{version}/lib%{name}-%{version}.pom Source2: https://raw.github.com/apache/%{name}/%{version}/bootstrap.sh -Source3: https://repo1.maven.org/maven2/org/apache/thrift/libfb303/%{version}/libfb303-%{version}.pom - # this patch is adapted from Gil Cattaneo's thrift-0.7.0 package -Patch0: %{name}-%{version}-buildxml.patch -# for fb303, excise maven ant tasks; build against system libraries; etc. -Patch1: fb303-%{version}-buildxml.patch +#Patch0: %{name}-%{version}-buildxml.patch # fix configure.ac insistence on using /usr/local/lib for JAVA_PREFIX Patch2: configure-java-prefix.patch -# fix for ppc64le builds not linking to /usr/lib64 directory -Patch3: fix-ppc64le-builds.patch -# fix for s390x build; incorporates fix for THRIFT-4177 with some code from THRIFT-4136 -Patch4: THRIFT-4177.patch - -# Update fb303 for python3 -Patch5: python3.patch # BuildRequires for language-specific bindings are listed under these @@ -114,7 +103,7 @@ BuildRequires: libevent-devel BuildRequires: libstdc++-devel BuildRequires: libtool BuildRequires: openssl-devel -BuildRequires: qt-devel +BuildRequires: qt5-qtbase-devel BuildRequires: texlive BuildRequires: zlib-devel @@ -278,46 +267,6 @@ BuildRequires: erlang-rebar The erlang-%{name} package contains Erlang bindings for %{name}. %endif -%package -n fb303 -Summary: Basic interface for Thrift services -Requires: %{name}%{?_isa} = %{version}-%{release} - -%description -n fb303 -fb303 is the shared root of all Thrift services; it provides a -standard interface to monitoring, dynamic options and configuration, -uptime reports, activity, etc. - -%package -n fb303-devel -Summary: Development files for fb303 -Requires: fb303%{?_isa} = %{version}-%{release} - -%description -n fb303-devel -The fb303-devel package contains header files for fb303 - -%package -n python3-fb303 -Summary: Python 3 bindings for fb303 -Requires: fb303%{?_isa} = %{version}-%{release} -BuildRequires: python3-devel -Obsoletes: python-fb303 < 0.10.0-1%{?dist} -Obsoletes: python2-fb303 < 0.10.0-14%{?dist} - -%description -n python3-fb303 -The python3-fb303 package contains Python bindings for fb303. - -%if 0%{?want_java} > 0 -%package -n fb303-java -Summary: Java bindings for fb303 -Requires: java-headless >= 1:1.6.0 -Requires: javapackages-tools -Requires: mvn(org.slf4j:slf4j-api) -Requires: mvn(commons-lang:commons-lang) -Requires: mvn(org.apache.httpcomponents:httpclient) -Requires: mvn(org.apache.httpcomponents:httpcore) -BuildArch: noarch - -%description -n fb303-java -The fb303-java package contains Java bindings for fb303. -%endif %prep %autosetup -p1 @@ -331,18 +280,13 @@ cp -p %{SOURCE2} bootstrap.sh # work around linking issues echo 'libthrift_c_glib_la_LIBADD = $(GLIB_LIBS) $(GOBJECT_LIBS) -L../cpp/.libs ' >> lib/c_glib/Makefile.am -echo 'libthriftqt_la_LIBADD = $(QT_LIBS) -lthrift -L.libs' >> lib/cpp/Makefile.am +echo 'libthriftqt5_la_LIBADD = $(QT_LIBS) -lthrift -L.libs' >> lib/cpp/Makefile.am echo 'libthriftz_la_LIBADD = $(ZLIB_LIBS) -lthrift -L.libs' >> lib/cpp/Makefile.am echo 'EXTRA_libthriftqt_la_DEPENDENCIES = libthrift.la' >> lib/cpp/Makefile.am echo 'EXTRA_libthriftz_la_DEPENDENCIES = libthrift.la' >> lib/cpp/Makefile.am -# echo 'libfb303_so_LIBADD = -lthrift -L../../../lib/cpp/.libs' >> contrib/fb303/cpp/Makefile.am - -sed -i 's|libfb303_so_LDFLAGS = $(SHARED_LDFLAGS)|libfb303_so_LDFLAGS = $(SHARED_LDFLAGS) -lthrift -L../../../lib/cpp/.libs -Wl,--as-needed|g' contrib/fb303/cpp/Makefile.am - # fix broken upstream check for ant version; we enforce this with BuildRequires, so no need to check here sed -i 's|ANT_VALID=.*|ANT_VALID=1|' aclocal/ax_javac_and_java.m4 -sed -i 's|ANT_VALID=.*|ANT_VALID=1|' contrib/fb303/aclocal/ax_javac_and_java.m4 # explicitly set python3 shopt -s globstar @@ -366,56 +310,22 @@ find . -name Makefile\* -exec sed -i -e 's/[.][/]rebar/rebar/g' {} \; sed -i 's|-Dinstall.javadoc.path=$(DESTDIR)$(docdir)/java|-Dinstall.javadoc.path=$(DESTDIR)%{_javadocdir}/%{name}|' lib/java/Makefile.* # build a jar without a version number -sed -i 's|${thrift.artifactid}-${version}|${thrift.artifactid}|' lib/java/build.xml +#sed -i 's|${thrift.artifactid}-${version}|${thrift.artifactid}|' lib/java/build.xml # Proper permissions for Erlang files sed -i 's|$(INSTALL) $$p|$(INSTALL) --mode 644 $$p|g' lib/erl/Makefile.am -# Build fb303 jars against the in-situ copy of thrift -sed -i 's|$(thrift_home)/bin/thrift|../../../compiler/cpp/thrift|g' \ - contrib/fb303/cpp/Makefile.am \ - contrib/fb303/py/Makefile.am - -sed -i 's|$(prefix)/lib$|%{_libdir}|g' contrib/fb303/cpp/Makefile.am - -sed -i 's|$(thrift_home)/include/thrift|../../../lib/cpp/src|g' \ - contrib/fb303/cpp/Makefile.am - -# Create a straightforward makefile for Java fb303 -echo "all: - ant -install: build/libfb303.jar - mkdir -p %{buildroot}%{_javadir} - /usr/bin/install -c -m 644 build/libfb303.jar %{buildroot}%{_javadir} -" > contrib/fb303/java/Makefile - sh ./bootstrap.sh # use unversioned doc dirs where appropriate (via _pkgdocdir macro) export PYTHON=%{_bindir}/python3 -%configure --disable-dependency-tracking --disable-static --with-boost=/usr %{java_configure} %{ruby_configure} %{erlang_configure} %{golang_configure} %{php_configure} --with-py3 --docdir=%{?_pkgdocdir}%{!?_pkgdocdir:%{_docdir}/%{name}-%{version}} +%configure --disable-dependency-tracking --disable-static --with-boost=/usr %{java_configure} %{ruby_configure} %{erlang_configure} %{golang_configure} %{php_configure} --docdir=%{?_pkgdocdir}%{!?_pkgdocdir:%{_docdir}/%{name}-%{version}} # eliminate unused direct shlib dependencies sed -i -e 's/ -shared / -Wl,--as-needed\0/g' libtool make %{?_smp_mflags} -# build fb303 -( - cd contrib/fb303 - sed -i '/^[.][/]configure.*/d' bootstrap.sh - sh bootstrap.sh - %configure --disable-static %{java_configure} --without-php --with-py3 --libdir=%{_libdir} - make %{?_smp_mflags} -) - -# build fb303 java -%if 0%{?want_java} > 0 -( - cd contrib/fb303/java - ant dist -) -%endif %install %make_install @@ -452,23 +362,6 @@ mv %{buildroot}/%{php_extdir}/Thrift %{buildroot}/%{_datadir}/php/ # Fix permissions on Thread.h find %{buildroot} -name Thread.h -exec chmod a-x '{}' \; -# install fb303 -( - cd contrib/fb303 - make DESTDIR=%{buildroot} install -) - -# install fb303 java -%if 0%{?want_java} > 0 -( - cd contrib/fb303/java - ant -Dinstall.path=%{buildroot}%{_javadir} -Dinstall.javadoc.path=%{buildroot}%{_javadocdir}/fb303 install -) -# install maven pom and depmaps for fb303 -install -pm 644 %{SOURCE3} %{buildroot}%{_mavenpomdir}/JPP-libfb303.pom -%add_maven_depmap JPP-libfb303.pom libfb303.jar -f "fb303" -%endif - # Ensure all python scripts are executable find %{buildroot} -name \*.py -exec grep -q /usr/bin/env {} \; -print | xargs -r chmod 755 @@ -486,19 +379,17 @@ find %{buildroot} -name \*.py -exec grep -q /usr/bin/env {} \; -print | xargs -r %{_libdir}/libthrift_c_glib.so.* %files qt -%{_libdir}/libthriftqt.so -%{_libdir}/libthriftqt-%{version}.so +%{_libdir}/libthriftqt5.so +%{_libdir}/libthriftqt5-%{version}.so %files devel %{_includedir}/thrift -%exclude %{_includedir}/thrift/fb303 %{_libdir}/*.so %{_libdir}/*.so.0 %{_libdir}/*.so.0.0.0 %exclude %{_libdir}/lib*-%{version}.so -%exclude %{_libdir}/libfb303.so %{_libdir}/pkgconfig/thrift-z.pc -%{_libdir}/pkgconfig/thrift-qt.pc +%{_libdir}/pkgconfig/thrift-qt5.pc %{_libdir}/pkgconfig/thrift-nb.pc %{_libdir}/pkgconfig/thrift.pc %{_libdir}/pkgconfig/thrift_c_glib.pc @@ -537,27 +428,13 @@ find %{buildroot} -name \*.py -exec grep -q /usr/bin/env {} \; -print | xargs -r %doc LICENSE NOTICE %endif -%files -n fb303 -%{_datarootdir}/fb303 -%doc LICENSE NOTICE - -%files -n fb303-devel -%{_libdir}/libfb303.so -%{_includedir}/thrift/fb303 -%doc LICENSE NOTICE - -%files -n python3-fb303 -%{python3_sitelib}/fb303 -%{python3_sitelib}/fb303_scripts -%{python3_sitelib}/%{name}_fb303-%{version}-py%{python3_version}.egg-info -%doc LICENSE NOTICE - -%if 0%{?want_java} > 0 -%files -n fb303-java -f .mfiles-fb303 -%doc LICENSE NOTICE -%endif %changelog +* Sun Dec 1 Orion Poplawski - 0.13.0-1 +- Update to 0.13.0 (bz#1778343) +- Drops fb303 package +- Switch to Qt5 + * Thu Oct 03 2019 Miro Hrončok - 0.10.0-20 - Rebuilt for Python 3.8.0rc1 (#1748018) From 7b110fb2151c362ed0e8fc4bd206899354062f31 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Mon, 2 Dec 2019 21:48:03 -0700 Subject: [PATCH 03/44] Fix changelog date --- thrift.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/thrift.spec b/thrift.spec index d42fbde..c271677 100644 --- a/thrift.spec +++ b/thrift.spec @@ -430,7 +430,7 @@ find %{buildroot} -name \*.py -exec grep -q /usr/bin/env {} \; -print | xargs -r %changelog -* Sun Dec 1 Orion Poplawski - 0.13.0-1 +* Sun Dec 1 2019 Orion Poplawski - 0.13.0-1 - Update to 0.13.0 (bz#1778343) - Drops fb303 package - Switch to Qt5 From 2181c09e6ffcdc81a90c9c00759aa04578cc9cf8 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Mon, 2 Dec 2019 21:51:01 -0700 Subject: [PATCH 04/44] Update pom --- libthrift-0.10.0.pom | 120 ------------------------------------------- libthrift-0.13.0.pom | 80 +++++++++++++++++++++++++++++ 2 files changed, 80 insertions(+), 120 deletions(-) delete mode 100644 libthrift-0.10.0.pom create mode 100644 libthrift-0.13.0.pom diff --git a/libthrift-0.10.0.pom b/libthrift-0.10.0.pom deleted file mode 100644 index 7c5f61d..0000000 --- a/libthrift-0.10.0.pom +++ /dev/null @@ -1,120 +0,0 @@ - - - 4.0.0 - org.apache.thrift - libthrift - 0.10.0 - pom - Apache Thrift - Thrift is a software framework for scalable cross-language services development. - http://thrift.apache.org - - - The Apache Software License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0.txt - - - - - mcslee - Mark Slee - - - dreiss - David Reiss - - - aditya - Aditya Agarwal - - - marck - Marc Kwiatkowski - - - jwang - James Wang - - - cpiro - Chris Piro - - - bmaurer - Ben Maurer - - - kclark - Kevin Clark - - - jake - Jake Luciani - - - bryanduxbury - Bryan Duxbury - - - esteve - Esteve Fernandez - - - todd - Todd Lipcon - - - geechorama - Andrew McGeachie - - - molinaro - Anthony Molinaro - - - roger - Roger Meier - - - jfarrell - Jake Farrell - - - jensg - Jens Geyer - - - carl - Carl Yeksigian - - - - scm:git:https://git-wip-us.apache.org/repos/asf/thrift.git - scm:git:https://git-wip-us.apache.org/repos/asf/thrift.git - https://git-wip-us.apache.org/repos/asf?p=thrift.git - - - - org.slf4j - slf4j-api - 1.7.12 - - - javax.servlet - servlet-api - 2.5 - provided - - - org.apache.httpcomponents - httpclient - 4.4.1 - - - org.apache.httpcomponents - httpcore - 4.4.1 - - - diff --git a/libthrift-0.13.0.pom b/libthrift-0.13.0.pom new file mode 100644 index 0000000..fdef4fa --- /dev/null +++ b/libthrift-0.13.0.pom @@ -0,0 +1,80 @@ + + + 4.0.0 + org.apache.thrift + libthrift + 0.13.0 + Apache Thrift + Thrift is a software framework for scalable cross-language services development. + http://thrift.apache.org + + + The Apache Software License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + + + + + dev + Apache Thrift Developers + dev@thrift.apache.org + + + + scm:git:https://github.com/apache/thrift.git + scm:git:git@github.com:apache/thrift.git + https://github.com/apache/thrift + + + + org.slf4j + slf4j-api + 1.7.25 + compile + + + org.apache.httpcomponents + httpclient + 4.5.6 + compile + + + org.apache.httpcomponents + httpcore + 4.4.1 + compile + + + javax.servlet + servlet-api + 2.5 + provided + + + javax.annotation + javax.annotation-api + 1.3.2 + compile + + + junit + junit + 4.12 + test + + + org.mockito + mockito-all + 1.9.5 + test + + + org.slf4j + slf4j-log4j12 + 1.7.25 + test + + + From 68dbcde685275bc078434ab250db88f87b525bfd Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Mon, 2 Dec 2019 21:57:10 -0700 Subject: [PATCH 05/44] One more qt -> qt5 change --- thrift.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/thrift.spec b/thrift.spec index c271677..7cdebcd 100644 --- a/thrift.spec +++ b/thrift.spec @@ -282,7 +282,7 @@ cp -p %{SOURCE2} bootstrap.sh echo 'libthrift_c_glib_la_LIBADD = $(GLIB_LIBS) $(GOBJECT_LIBS) -L../cpp/.libs ' >> lib/c_glib/Makefile.am echo 'libthriftqt5_la_LIBADD = $(QT_LIBS) -lthrift -L.libs' >> lib/cpp/Makefile.am echo 'libthriftz_la_LIBADD = $(ZLIB_LIBS) -lthrift -L.libs' >> lib/cpp/Makefile.am -echo 'EXTRA_libthriftqt_la_DEPENDENCIES = libthrift.la' >> lib/cpp/Makefile.am +echo 'EXTRA_libthriftqt5_la_DEPENDENCIES = libthrift.la' >> lib/cpp/Makefile.am echo 'EXTRA_libthriftz_la_DEPENDENCIES = libthrift.la' >> lib/cpp/Makefile.am # fix broken upstream check for ant version; we enforce this with BuildRequires, so no need to check here From 4f8d42901cd7f4ea393cff015fa58c92bfebb12d Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Wed, 4 Dec 2019 20:49:42 -0700 Subject: [PATCH 06/44] Fix perl dependencies Explicitly disable lua --- thrift.spec | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/thrift.spec b/thrift.spec index 7cdebcd..aa9a779 100644 --- a/thrift.spec +++ b/thrift.spec @@ -57,9 +57,15 @@ %global want_golang 0 %global golang_configure --without-go +# Thrift's Lua support has not yet been worked on +%global want_lua 0 +%global lua_configure --without-lua + +# NOTE: thrift versions their libraries by package version, so each version +# change is a SONAME change and dependencies need to be rebuilt Name: thrift Version: 0.13.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Software framework for cross-language services development # Parts of the source are used under the BSD and zlib licenses, but @@ -175,6 +181,11 @@ Requires: perl(constant) Requires: perl(strict) Requires: perl(utf8) Requires: perl(warnings) +# thrift improperly packages some components in files with names different +# than the package they contain +Provides: perl(Thrift::Exception) +Provides: perl(Thrift::MessageType) +Provides: perl(Thrift::Type) BuildArch: noarch %description -n perl-%{name} @@ -319,7 +330,9 @@ sh ./bootstrap.sh # use unversioned doc dirs where appropriate (via _pkgdocdir macro) export PYTHON=%{_bindir}/python3 -%configure --disable-dependency-tracking --disable-static --with-boost=/usr %{java_configure} %{ruby_configure} %{erlang_configure} %{golang_configure} %{php_configure} --docdir=%{?_pkgdocdir}%{!?_pkgdocdir:%{_docdir}/%{name}-%{version}} +%configure --disable-dependency-tracking --disable-static --with-boost=/usr \ + --docdir=%{?_pkgdocdir}%{!?_pkgdocdir:%{_docdir}/%{name}-%{version}} \ + %{java_configure} %{ruby_configure} %{erlang_configure} %{golang_configure} %{php_configure} %{lua_configure} # eliminate unused direct shlib dependencies sed -i -e 's/ -shared / -Wl,--as-needed\0/g' libtool @@ -430,6 +443,10 @@ find %{buildroot} -name \*.py -exec grep -q /usr/bin/env {} \; -print | xargs -r %changelog +* Wed Dec 4 2019 Orion Poplawski - 0.13.0-2 +- Fix perl dependencies +- Explicitly disable lua + * Sun Dec 1 2019 Orion Poplawski - 0.13.0-1 - Update to 0.13.0 (bz#1778343) - Drops fb303 package From 73b2bcebf7fb9e4f4982db049ce8e872bd1e675f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 31 Jan 2020 01:30:12 +0000 Subject: [PATCH 07/44] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- thrift.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/thrift.spec b/thrift.spec index aa9a779..c43c99d 100644 --- a/thrift.spec +++ b/thrift.spec @@ -65,7 +65,7 @@ # change is a SONAME change and dependencies need to be rebuilt Name: thrift Version: 0.13.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Software framework for cross-language services development # Parts of the source are used under the BSD and zlib licenses, but @@ -443,6 +443,9 @@ find %{buildroot} -name \*.py -exec grep -q /usr/bin/env {} \; -print | xargs -r %changelog +* Fri Jan 31 2020 Fedora Release Engineering - 0.13.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Wed Dec 4 2019 Orion Poplawski - 0.13.0-2 - Fix perl dependencies - Explicitly disable lua From a78384718c32db5404e35b7947decfa5bd98ff35 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Tue, 26 May 2020 03:51:54 +0200 Subject: [PATCH 08/44] Rebuilt for Python 3.9 --- thrift.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/thrift.spec b/thrift.spec index c43c99d..ccce965 100644 --- a/thrift.spec +++ b/thrift.spec @@ -65,7 +65,7 @@ # change is a SONAME change and dependencies need to be rebuilt Name: thrift Version: 0.13.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Software framework for cross-language services development # Parts of the source are used under the BSD and zlib licenses, but @@ -443,6 +443,9 @@ find %{buildroot} -name \*.py -exec grep -q /usr/bin/env {} \; -print | xargs -r %changelog +* Tue May 26 2020 Miro Hrončok - 0.13.0-4 +- Rebuilt for Python 3.9 + * Fri Jan 31 2020 Fedora Release Engineering - 0.13.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild From 2567e0e7918e6661a9c7235cc8d2b1ddacecdb52 Mon Sep 17 00:00:00 2001 From: Jitka Plesnikova Date: Tue, 23 Jun 2020 11:39:46 +0200 Subject: [PATCH 09/44] Perl 5.32 rebuild --- thrift.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/thrift.spec b/thrift.spec index ccce965..8957c0a 100644 --- a/thrift.spec +++ b/thrift.spec @@ -65,7 +65,7 @@ # change is a SONAME change and dependencies need to be rebuilt Name: thrift Version: 0.13.0 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Software framework for cross-language services development # Parts of the source are used under the BSD and zlib licenses, but @@ -443,6 +443,9 @@ find %{buildroot} -name \*.py -exec grep -q /usr/bin/env {} \; -print | xargs -r %changelog +* Tue Jun 23 2020 Jitka Plesnikova - 0.13.0-5 +- Perl 5.32 rebuild + * Tue May 26 2020 Miro Hrončok - 0.13.0-4 - Rebuilt for Python 3.9 From fa2b09f6459bcd4bc3c6617a468bc9cd9e689834 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 29 Jul 2020 12:26:26 +0000 Subject: [PATCH 10/44] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- thrift.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/thrift.spec b/thrift.spec index 8957c0a..cff0608 100644 --- a/thrift.spec +++ b/thrift.spec @@ -65,7 +65,7 @@ # change is a SONAME change and dependencies need to be rebuilt Name: thrift Version: 0.13.0 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Software framework for cross-language services development # Parts of the source are used under the BSD and zlib licenses, but @@ -443,6 +443,9 @@ find %{buildroot} -name \*.py -exec grep -q /usr/bin/env {} \; -print | xargs -r %changelog +* Wed Jul 29 2020 Fedora Release Engineering - 0.13.0-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Tue Jun 23 2020 Jitka Plesnikova - 0.13.0-5 - Perl 5.32 rebuild From eddb9dc7305bf242ee477c19835cf93325ceb174 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Thu, 17 Sep 2020 21:04:16 -0600 Subject: [PATCH 11/44] Drop unneeded BR on flex-devel (bz#1871095) --- thrift.spec | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/thrift.spec b/thrift.spec index cff0608..64bd3e5 100644 --- a/thrift.spec +++ b/thrift.spec @@ -65,7 +65,7 @@ # change is a SONAME change and dependencies need to be rebuilt Name: thrift Version: 0.13.0 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Software framework for cross-language services development # Parts of the source are used under the BSD and zlib licenses, but @@ -102,7 +102,6 @@ BuildRequires: bison BuildRequires: boost-devel BuildRequires: boost-static BuildRequires: flex -BuildRequires: flex-devel BuildRequires: gcc-c++ BuildRequires: glib2-devel BuildRequires: libevent-devel @@ -443,6 +442,9 @@ find %{buildroot} -name \*.py -exec grep -q /usr/bin/env {} \; -print | xargs -r %changelog +* Thu Sep 17 2020 Orion Poplawski - 0.13.0-7 +- Drop unneeded BR on flex-devel (bz#1871095) + * Wed Jul 29 2020 Fedora Release Engineering - 0.13.0-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From f37407955c85ed5ed9b2508252b92d6075a90a2a Mon Sep 17 00:00:00 2001 From: Christopher Tubbs Date: Wed, 23 Sep 2020 09:07:32 -0400 Subject: [PATCH 12/44] rebuilt for side tag f34-build-side-30069 --- thrift.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/thrift.spec b/thrift.spec index 64bd3e5..76ef633 100644 --- a/thrift.spec +++ b/thrift.spec @@ -65,7 +65,7 @@ # change is a SONAME change and dependencies need to be rebuilt Name: thrift Version: 0.13.0 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Software framework for cross-language services development # Parts of the source are used under the BSD and zlib licenses, but @@ -442,6 +442,9 @@ find %{buildroot} -name \*.py -exec grep -q /usr/bin/env {} \; -print | xargs -r %changelog +* Wed Sep 23 2020 Christopher Tubbs - 0.13.0-8 +- rebuilt for side tag f34-build-side-30069 + * Thu Sep 17 2020 Orion Poplawski - 0.13.0-7 - Drop unneeded BR on flex-devel (bz#1871095) From c7836e8a6061e07a329f2fbff63b0a83c6c12402 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Mon, 5 Oct 2020 19:44:17 -0600 Subject: [PATCH 13/44] Add BR python3-setuptools --- thrift.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/thrift.spec b/thrift.spec index 76ef633..8fa49fa 100644 --- a/thrift.spec +++ b/thrift.spec @@ -65,7 +65,7 @@ # change is a SONAME change and dependencies need to be rebuilt Name: thrift Version: 0.13.0 -Release: 8%{?dist} +Release: 9%{?dist} Summary: Software framework for cross-language services development # Parts of the source are used under the BSD and zlib licenses, but @@ -151,6 +151,7 @@ The %{name}-qt package contains GLib bindings for %{name}. %package -n python3-%{name} Summary: Python 3 support for %{name} BuildRequires: python3-devel +BuildRequires: python3-setuptools Requires: %{name}%{?_isa} = %{version}-%{release} Requires: python3 Obsoletes: python-%{name} < 0.10.0-1%{?dist} @@ -442,6 +443,9 @@ find %{buildroot} -name \*.py -exec grep -q /usr/bin/env {} \; -print | xargs -r %changelog +* Mon Oct 05 2020 Orion Poplawski - 0.13.0-9 +- Add BR python3-setuptools + * Wed Sep 23 2020 Christopher Tubbs - 0.13.0-8 - rebuilt for side tag f34-build-side-30069 From a39efdcfc334030e9c9649b61e6f050762cec375 Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Tue, 12 Jan 2021 00:47:02 +0000 Subject: [PATCH 14/44] Add BuildRequires: make https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot --- thrift.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/thrift.spec b/thrift.spec index 8fa49fa..1c40587 100644 --- a/thrift.spec +++ b/thrift.spec @@ -96,6 +96,7 @@ Patch2: configure-java-prefix.patch %if 0%{?want_java} > 0 BuildRequires: ant >= 1.7 %endif +BuildRequires: make BuildRequires: autoconf BuildRequires: automake BuildRequires: bison From 8b82732945b1f2789009c115e2429ff2819231de Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 27 Jan 2021 21:54:29 +0000 Subject: [PATCH 15/44] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- thrift.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/thrift.spec b/thrift.spec index 1c40587..4d71dd8 100644 --- a/thrift.spec +++ b/thrift.spec @@ -65,7 +65,7 @@ # change is a SONAME change and dependencies need to be rebuilt Name: thrift Version: 0.13.0 -Release: 9%{?dist} +Release: 10%{?dist} Summary: Software framework for cross-language services development # Parts of the source are used under the BSD and zlib licenses, but @@ -444,6 +444,9 @@ find %{buildroot} -name \*.py -exec grep -q /usr/bin/env {} \; -print | xargs -r %changelog +* Wed Jan 27 2021 Fedora Release Engineering - 0.13.0-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Mon Oct 05 2020 Orion Poplawski - 0.13.0-9 - Add BR python3-setuptools From 2e9246ff7fcf8303ef870a57cfddd6ce3e5e0473 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Mon, 15 Feb 2021 08:19:27 -0700 Subject: [PATCH 16/44] Update to 0.14.0 (bz#1928172) CVE-2020-13949 --- .gitignore | 1 + libthrift-0.13.0.pom => libthrift-0.14.0.pom | 2 +- sources | 2 +- thrift.spec | 9 ++++++--- 4 files changed, 9 insertions(+), 5 deletions(-) rename libthrift-0.13.0.pom => libthrift-0.14.0.pom (98%) diff --git a/.gitignore b/.gitignore index 618bab6..bd50136 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /0.9.1.tar.gz /thrift-0.10.0.tar.gz /thrift-0.13.0.tar.gz +/thrift-0.14.0.tar.gz diff --git a/libthrift-0.13.0.pom b/libthrift-0.14.0.pom similarity index 98% rename from libthrift-0.13.0.pom rename to libthrift-0.14.0.pom index fdef4fa..31d44de 100644 --- a/libthrift-0.13.0.pom +++ b/libthrift-0.14.0.pom @@ -4,7 +4,7 @@ 4.0.0 org.apache.thrift libthrift - 0.13.0 + 0.14.0 Apache Thrift Thrift is a software framework for scalable cross-language services development. http://thrift.apache.org diff --git a/sources b/sources index 63b1dcc..d140fab 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (thrift-0.13.0.tar.gz) = 5f7426d1e429ead20dd366f63a6d619071eccc17dc0395738307eef507b703733d029147fb596c4d392d31dc822777ea2a0be709f1f677b1221c9335cfcb09b7 +SHA512 (thrift-0.14.0.tar.gz) = 4bf1c9f8f7eeb75c5d70f14657d530a574002846266668c56c1153c6820e6ba199bb462893505cb8cfb7a4cc481b11a4fe84d0d26a3279424c5948f45fa8ce3f diff --git a/thrift.spec b/thrift.spec index 4d71dd8..32ab8b9 100644 --- a/thrift.spec +++ b/thrift.spec @@ -64,8 +64,8 @@ # NOTE: thrift versions their libraries by package version, so each version # change is a SONAME change and dependencies need to be rebuilt Name: thrift -Version: 0.13.0 -Release: 10%{?dist} +Version: 0.14.0 +Release: 1%{?dist} Summary: Software framework for cross-language services development # Parts of the source are used under the BSD and zlib licenses, but @@ -338,7 +338,7 @@ export PYTHON=%{_bindir}/python3 # eliminate unused direct shlib dependencies sed -i -e 's/ -shared / -Wl,--as-needed\0/g' libtool -make %{?_smp_mflags} +%make_build %install @@ -444,6 +444,9 @@ find %{buildroot} -name \*.py -exec grep -q /usr/bin/env {} \; -print | xargs -r %changelog +* Mon Feb 15 2021 Orion Poplawski - 0.14.0-1 +- Update to 0.14.0 (bz#1928172) CVE-2020-13949 + * Wed Jan 27 2021 Fedora Release Engineering - 0.13.0-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From 4de2b22333c9938e7281175b164d7a6e06ddcd99 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Wed, 17 Feb 2021 18:50:01 -0700 Subject: [PATCH 17/44] Add patch to fix compilation on non-x86 --- thrift-char.patch | 13 +++++++++++++ thrift.spec | 10 +++++++--- 2 files changed, 20 insertions(+), 3 deletions(-) create mode 100644 thrift-char.patch diff --git a/thrift-char.patch b/thrift-char.patch new file mode 100644 index 0000000..3004d36 --- /dev/null +++ b/thrift-char.patch @@ -0,0 +1,13 @@ +diff --git a/compiler/cpp/src/thrift/generate/t_delphi_generator.cc b/compiler/cpp/src/thrift/generate/t_delphi_generator.cc +index d3ad76a32..eac46a6c7 100644 +--- a/compiler/cpp/src/thrift/generate/t_delphi_generator.cc ++++ b/compiler/cpp/src/thrift/generate/t_delphi_generator.cc +@@ -1062,7 +1062,7 @@ std::string t_delphi_generator::make_pascal_string_literal(std::string value) { + } + + result << "'"; +- for (char const &c: value) { ++ for (signed char const c: value) { + if( (c >= 0) && (c < 32)) { // convert ctrl chars, but leave UTF-8 alone + result << "#" << (int)c; + } else if (c == '\'') { diff --git a/thrift.spec b/thrift.spec index 32ab8b9..a9f4b97 100644 --- a/thrift.spec +++ b/thrift.spec @@ -65,7 +65,7 @@ # change is a SONAME change and dependencies need to be rebuilt Name: thrift Version: 0.14.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Software framework for cross-language services development # Parts of the source are used under the BSD and zlib licenses, but @@ -83,8 +83,9 @@ Source0: https://archive.apache.org/dist/%{name}/%{version}/%{name}-%{version}.t Source1: https://repo1.maven.org/maven2/org/apache/thrift/lib%{name}/%{version}/lib%{name}-%{version}.pom Source2: https://raw.github.com/apache/%{name}/%{version}/bootstrap.sh -# this patch is adapted from Gil Cattaneo's thrift-0.7.0 package -#Patch0: %{name}-%{version}-buildxml.patch +# Fix char warning +# https://issues.apache.org/jira/browse/THRIFT-5350 +Patch0: thrift-char.patch # fix configure.ac insistence on using /usr/local/lib for JAVA_PREFIX Patch2: configure-java-prefix.patch @@ -444,6 +445,9 @@ find %{buildroot} -name \*.py -exec grep -q /usr/bin/env {} \; -print | xargs -r %changelog +* Thu Feb 18 2021 Orion Poplawski - 0.14.0-2 +- Add patch to fix compilation on non-x86 + * Mon Feb 15 2021 Orion Poplawski - 0.14.0-1 - Update to 0.14.0 (bz#1928172) CVE-2020-13949 From a5abe5fb6fff21c61554fd1ad8e83d17424573af Mon Sep 17 00:00:00 2001 From: Jitka Plesnikova Date: Sun, 23 May 2021 02:21:08 +0200 Subject: [PATCH 18/44] Perl 5.34 rebuild --- thrift.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/thrift.spec b/thrift.spec index a9f4b97..335da2d 100644 --- a/thrift.spec +++ b/thrift.spec @@ -65,7 +65,7 @@ # change is a SONAME change and dependencies need to be rebuilt Name: thrift Version: 0.14.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Software framework for cross-language services development # Parts of the source are used under the BSD and zlib licenses, but @@ -445,6 +445,9 @@ find %{buildroot} -name \*.py -exec grep -q /usr/bin/env {} \; -print | xargs -r %changelog +* Sun May 23 2021 Jitka Plesnikova - 0.14.0-3 +- Perl 5.34 rebuild + * Thu Feb 18 2021 Orion Poplawski - 0.14.0-2 - Add patch to fix compilation on non-x86 From 6888753b89c6409cc2c415447cdd71d6d630b139 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 4 Jun 2021 21:16:37 +0200 Subject: [PATCH 19/44] Rebuilt for Python 3.10 --- thrift.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/thrift.spec b/thrift.spec index 335da2d..5f8d346 100644 --- a/thrift.spec +++ b/thrift.spec @@ -65,7 +65,7 @@ # change is a SONAME change and dependencies need to be rebuilt Name: thrift Version: 0.14.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Software framework for cross-language services development # Parts of the source are used under the BSD and zlib licenses, but @@ -445,6 +445,9 @@ find %{buildroot} -name \*.py -exec grep -q /usr/bin/env {} \; -print | xargs -r %changelog +* Fri Jun 04 2021 Python Maint - 0.14.0-4 +- Rebuilt for Python 3.10 + * Sun May 23 2021 Jitka Plesnikova - 0.14.0-3 - Perl 5.34 rebuild From a7ff3c27c982e1d6f5ce8a3509260b8fbcdfadb9 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 23 Jul 2021 19:12:48 +0000 Subject: [PATCH 20/44] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- thrift.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/thrift.spec b/thrift.spec index 5f8d346..15b73db 100644 --- a/thrift.spec +++ b/thrift.spec @@ -65,7 +65,7 @@ # change is a SONAME change and dependencies need to be rebuilt Name: thrift Version: 0.14.0 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Software framework for cross-language services development # Parts of the source are used under the BSD and zlib licenses, but @@ -445,6 +445,9 @@ find %{buildroot} -name \*.py -exec grep -q /usr/bin/env {} \; -print | xargs -r %changelog +* Fri Jul 23 2021 Fedora Release Engineering - 0.14.0-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Fri Jun 04 2021 Python Maint - 0.14.0-4 - Rebuilt for Python 3.10 From 45924cc4835096de2056e7c3924ca1779e98aa68 Mon Sep 17 00:00:00 2001 From: Sahana Prasad Date: Tue, 14 Sep 2021 19:16:31 +0200 Subject: [PATCH 21/44] Rebuilt with OpenSSL 3.0.0 --- thrift.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/thrift.spec b/thrift.spec index 15b73db..c4c9642 100644 --- a/thrift.spec +++ b/thrift.spec @@ -65,7 +65,7 @@ # change is a SONAME change and dependencies need to be rebuilt Name: thrift Version: 0.14.0 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Software framework for cross-language services development # Parts of the source are used under the BSD and zlib licenses, but @@ -445,6 +445,9 @@ find %{buildroot} -name \*.py -exec grep -q /usr/bin/env {} \; -print | xargs -r %changelog +* Tue Sep 14 2021 Sahana Prasad - 0.14.0-6 +- Rebuilt with OpenSSL 3.0.0 + * Fri Jul 23 2021 Fedora Release Engineering - 0.14.0-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From 809f46c8100ad8d86383856112b5152fd5989690 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jan 2022 02:39:12 +0000 Subject: [PATCH 22/44] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- thrift.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/thrift.spec b/thrift.spec index c4c9642..7fdaa05 100644 --- a/thrift.spec +++ b/thrift.spec @@ -65,7 +65,7 @@ # change is a SONAME change and dependencies need to be rebuilt Name: thrift Version: 0.14.0 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Software framework for cross-language services development # Parts of the source are used under the BSD and zlib licenses, but @@ -445,6 +445,9 @@ find %{buildroot} -name \*.py -exec grep -q /usr/bin/env {} \; -print | xargs -r %changelog +* Sat Jan 22 2022 Fedora Release Engineering - 0.14.0-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Tue Sep 14 2021 Sahana Prasad - 0.14.0-6 - Rebuilt with OpenSSL 3.0.0 From c03542a9b14d95b3b520b9fafa744b3d4796b11d Mon Sep 17 00:00:00 2001 From: Jitka Plesnikova Date: Wed, 1 Jun 2022 08:27:44 +0200 Subject: [PATCH 23/44] Perl 5.36 rebuild --- thrift.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/thrift.spec b/thrift.spec index 7fdaa05..d27b6a3 100644 --- a/thrift.spec +++ b/thrift.spec @@ -65,7 +65,7 @@ # change is a SONAME change and dependencies need to be rebuilt Name: thrift Version: 0.14.0 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Software framework for cross-language services development # Parts of the source are used under the BSD and zlib licenses, but @@ -445,6 +445,9 @@ find %{buildroot} -name \*.py -exec grep -q /usr/bin/env {} \; -print | xargs -r %changelog +* Wed Jun 01 2022 Jitka Plesnikova - 0.14.0-8 +- Perl 5.36 rebuild + * Sat Jan 22 2022 Fedora Release Engineering - 0.14.0-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From 634e406a86a4c387bed3674a6d0cc63db0aabb7e Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Tue, 24 May 2022 10:05:13 -0400 Subject: [PATCH 24/44] Work around GCC 12 error by disabling LTO (close RHBZ#2046213) --- thrift.spec | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/thrift.spec b/thrift.spec index d27b6a3..74a0fb0 100644 --- a/thrift.spec +++ b/thrift.spec @@ -1,3 +1,14 @@ +# thrift: FTBFS in Fedora 36: /usr/include/c++/12/bits/new_allocator.h:158:33: +# error: 'operator delete' called on pointer '_605' with nonzero offset [1, +# 9223372036854775800] [-Werror=free-nonheap-object] +# https://bugzilla.redhat.com/show_bug.cgi?id=2046213 +# +# Fails to build with gcc 12 +# https://issues.apache.org/jira/browse/THRIFT-5498 +# +# Work around this for now by disabling LTO: +%global _lto_cflags %{nil} + %global php_extdir %(php-config --extension-dir 2>/dev/null || echo "undefined") %{?perl_default_filter} @@ -65,7 +76,7 @@ # change is a SONAME change and dependencies need to be rebuilt Name: thrift Version: 0.14.0 -Release: 8%{?dist} +Release: 9%{?dist} Summary: Software framework for cross-language services development # Parts of the source are used under the BSD and zlib licenses, but @@ -445,6 +456,9 @@ find %{buildroot} -name \*.py -exec grep -q /usr/bin/env {} \; -print | xargs -r %changelog +* Tue Jun 07 2022 Benjamin A. Beasley - 0.14.0-9 +- Work around GCC 12 error by disabling LTO (close RHBZ#2046213) + * Wed Jun 01 2022 Jitka Plesnikova - 0.14.0-8 - Perl 5.36 rebuild From a065d791744648b779e8e55c15db1535100f0880 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Mon, 13 Jun 2022 19:54:14 +0200 Subject: [PATCH 25/44] Rebuilt for Python 3.11 --- thrift.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/thrift.spec b/thrift.spec index 74a0fb0..949f66a 100644 --- a/thrift.spec +++ b/thrift.spec @@ -76,7 +76,7 @@ # change is a SONAME change and dependencies need to be rebuilt Name: thrift Version: 0.14.0 -Release: 9%{?dist} +Release: 10%{?dist} Summary: Software framework for cross-language services development # Parts of the source are used under the BSD and zlib licenses, but @@ -456,6 +456,9 @@ find %{buildroot} -name \*.py -exec grep -q /usr/bin/env {} \; -print | xargs -r %changelog +* Mon Jun 13 2022 Python Maint - 0.14.0-10 +- Rebuilt for Python 3.11 + * Tue Jun 07 2022 Benjamin A. Beasley - 0.14.0-9 - Work around GCC 12 error by disabling LTO (close RHBZ#2046213) From a9d14cfc623e9f918fb6c894148cd98e360491d7 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 23 Jul 2022 10:26:05 +0000 Subject: [PATCH 26/44] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- thrift.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/thrift.spec b/thrift.spec index 949f66a..9cd8ef3 100644 --- a/thrift.spec +++ b/thrift.spec @@ -76,7 +76,7 @@ # change is a SONAME change and dependencies need to be rebuilt Name: thrift Version: 0.14.0 -Release: 10%{?dist} +Release: 11%{?dist} Summary: Software framework for cross-language services development # Parts of the source are used under the BSD and zlib licenses, but @@ -456,6 +456,9 @@ find %{buildroot} -name \*.py -exec grep -q /usr/bin/env {} \; -print | xargs -r %changelog +* Sat Jul 23 2022 Fedora Release Engineering - 0.14.0-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Mon Jun 13 2022 Python Maint - 0.14.0-10 - Rebuilt for Python 3.11 From c5f5a28be91367fa88b9dd934ecfa6d73ac522d8 Mon Sep 17 00:00:00 2001 From: Christopher Tubbs Date: Fri, 18 Nov 2022 11:16:37 -0500 Subject: [PATCH 27/44] Convert license tags to SPDX --- thrift.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/thrift.spec b/thrift.spec index 9cd8ef3..dec44d8 100644 --- a/thrift.spec +++ b/thrift.spec @@ -76,7 +76,7 @@ # change is a SONAME change and dependencies need to be rebuilt Name: thrift Version: 0.14.0 -Release: 11%{?dist} +Release: 12%{?dist} Summary: Software framework for cross-language services development # Parts of the source are used under the BSD and zlib licenses, but @@ -86,7 +86,7 @@ Summary: Software framework for cross-language services development # Here's the breakdown: # ./lib/py/compat/win32/stdint.h is 2-clause BSD # ./compiler/cpp/src/md5.[ch] are zlib -License: ASL 2.0 and BSD and zlib +License: Apache-2.0 AND BSD-3-Clause AND Zlib URL: https://thrift.apache.org/ Source0: https://archive.apache.org/dist/%{name}/%{version}/%{name}-%{version}.tar.gz @@ -383,7 +383,7 @@ mv %{buildroot}/usr/lib/perl5/* %{buildroot}/%{perl_vendorlib} # Move arch-independent php files into the appropriate place mkdir -p %{buildroot}/%{_datadir}/php/ mv %{buildroot}/%{php_extdir}/Thrift %{buildroot}/%{_datadir}/php/ -%endif # want_php +%endif # Fix permissions on Thread.h find %{buildroot} -name Thread.h -exec chmod a-x '{}' \; @@ -456,6 +456,9 @@ find %{buildroot} -name \*.py -exec grep -q /usr/bin/env {} \; -print | xargs -r %changelog +* Fri Nov 18 2022 Christopher Tubbs - 0.14.0-12 +- Convert license tags to SPDX + * Sat Jul 23 2022 Fedora Release Engineering - 0.14.0-11 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From 3c63baeede70d2318f496ce92cb365a4ba6bd327 Mon Sep 17 00:00:00 2001 From: Jitka Plesnikova Date: Fri, 13 Jan 2023 21:16:43 +0100 Subject: [PATCH 28/44] Remove perl(MODULE_COMPAT), it will be replaced by generators --- thrift.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/thrift.spec b/thrift.spec index dec44d8..e68e2e9 100644 --- a/thrift.spec +++ b/thrift.spec @@ -180,7 +180,6 @@ BuildRequires: perl(Bit::Vector) BuildRequires: perl(Class::Accessor) BuildRequires: perl(ExtUtils::MakeMaker) BuildRequires: perl-generators -Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) Requires: perl(Bit::Vector) Requires: perl(Encode) Requires: perl(HTTP::Request) From 2e71c67eeed001e3113094c0f49f867b9518e584 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 21 Jan 2023 05:00:18 +0000 Subject: [PATCH 29/44] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- thrift.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/thrift.spec b/thrift.spec index e68e2e9..a87cf3b 100644 --- a/thrift.spec +++ b/thrift.spec @@ -76,7 +76,7 @@ # change is a SONAME change and dependencies need to be rebuilt Name: thrift Version: 0.14.0 -Release: 12%{?dist} +Release: 13%{?dist} Summary: Software framework for cross-language services development # Parts of the source are used under the BSD and zlib licenses, but @@ -455,6 +455,9 @@ find %{buildroot} -name \*.py -exec grep -q /usr/bin/env {} \; -print | xargs -r %changelog +* Sat Jan 21 2023 Fedora Release Engineering - 0.14.0-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Fri Nov 18 2022 Christopher Tubbs - 0.14.0-12 - Convert license tags to SPDX From f9e02420c81bff9cdb46b00361a9ff55d36fbeb8 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Tue, 13 Jun 2023 23:29:33 +0200 Subject: [PATCH 30/44] Rebuilt for Python 3.12 --- thrift.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/thrift.spec b/thrift.spec index a87cf3b..ca1c5d9 100644 --- a/thrift.spec +++ b/thrift.spec @@ -76,7 +76,7 @@ # change is a SONAME change and dependencies need to be rebuilt Name: thrift Version: 0.14.0 -Release: 13%{?dist} +Release: 14%{?dist} Summary: Software framework for cross-language services development # Parts of the source are used under the BSD and zlib licenses, but @@ -455,6 +455,9 @@ find %{buildroot} -name \*.py -exec grep -q /usr/bin/env {} \; -print | xargs -r %changelog +* Tue Jun 13 2023 Python Maint - 0.14.0-14 +- Rebuilt for Python 3.12 + * Sat Jan 21 2023 Fedora Release Engineering - 0.14.0-13 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From 7543be71062232f1927822fa295685693dc6eb0b Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Mon, 16 Jan 2023 20:46:24 -0700 Subject: [PATCH 31/44] Update to 0.15.0 --- .gitignore | 1 + libthrift-0.14.0.pom => libthrift-0.15.0.pom | 18 +++++++++--------- sources | 2 +- thrift-char.patch | 13 ------------- thrift.spec | 10 +++++----- 5 files changed, 16 insertions(+), 28 deletions(-) rename libthrift-0.14.0.pom => libthrift-0.15.0.pom (87%) delete mode 100644 thrift-char.patch diff --git a/.gitignore b/.gitignore index bd50136..7f5d81c 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /thrift-0.10.0.tar.gz /thrift-0.13.0.tar.gz /thrift-0.14.0.tar.gz +/thrift-0.15.0.tar.gz diff --git a/libthrift-0.14.0.pom b/libthrift-0.15.0.pom similarity index 87% rename from libthrift-0.14.0.pom rename to libthrift-0.15.0.pom index 31d44de..26547ce 100644 --- a/libthrift-0.14.0.pom +++ b/libthrift-0.15.0.pom @@ -4,14 +4,14 @@ 4.0.0 org.apache.thrift libthrift - 0.14.0 + 0.15.0 Apache Thrift Thrift is a software framework for scalable cross-language services development. http://thrift.apache.org The Apache Software License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0.txt + https://www.apache.org/licenses/LICENSE-2.0.txt repo @@ -31,25 +31,25 @@ org.slf4j slf4j-api - 1.7.25 + 1.7.28 compile org.apache.httpcomponents httpclient - 4.5.6 + 4.5.10 compile org.apache.httpcomponents httpcore - 4.4.1 + 4.4.12 compile javax.servlet - servlet-api - 2.5 + javax.servlet-api + 4.0.1 provided @@ -67,13 +67,13 @@ org.mockito mockito-all - 1.9.5 + 1.10.19 test org.slf4j slf4j-log4j12 - 1.7.25 + 1.7.28 test diff --git a/sources b/sources index d140fab..38878fe 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (thrift-0.14.0.tar.gz) = 4bf1c9f8f7eeb75c5d70f14657d530a574002846266668c56c1153c6820e6ba199bb462893505cb8cfb7a4cc481b11a4fe84d0d26a3279424c5948f45fa8ce3f +SHA512 (thrift-0.15.0.tar.gz) = 37e48d1872c85abc92ae86017f98bb092ac2b64e46be21ed6fa0b72d46cf956257efcc7db344b55aa9a70f9a9741d400081c1b78f1eb8d72c9e53a196f3e62ef diff --git a/thrift-char.patch b/thrift-char.patch deleted file mode 100644 index 3004d36..0000000 --- a/thrift-char.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/compiler/cpp/src/thrift/generate/t_delphi_generator.cc b/compiler/cpp/src/thrift/generate/t_delphi_generator.cc -index d3ad76a32..eac46a6c7 100644 ---- a/compiler/cpp/src/thrift/generate/t_delphi_generator.cc -+++ b/compiler/cpp/src/thrift/generate/t_delphi_generator.cc -@@ -1062,7 +1062,7 @@ std::string t_delphi_generator::make_pascal_string_literal(std::string value) { - } - - result << "'"; -- for (char const &c: value) { -+ for (signed char const c: value) { - if( (c >= 0) && (c < 32)) { // convert ctrl chars, but leave UTF-8 alone - result << "#" << (int)c; - } else if (c == '\'') { diff --git a/thrift.spec b/thrift.spec index ca1c5d9..2f12495 100644 --- a/thrift.spec +++ b/thrift.spec @@ -75,8 +75,8 @@ # NOTE: thrift versions their libraries by package version, so each version # change is a SONAME change and dependencies need to be rebuilt Name: thrift -Version: 0.14.0 -Release: 14%{?dist} +Version: 0.15.0 +Release: 1%{?dist} Summary: Software framework for cross-language services development # Parts of the source are used under the BSD and zlib licenses, but @@ -94,9 +94,6 @@ Source0: https://archive.apache.org/dist/%{name}/%{version}/%{name}-%{version}.t Source1: https://repo1.maven.org/maven2/org/apache/thrift/lib%{name}/%{version}/lib%{name}-%{version}.pom Source2: https://raw.github.com/apache/%{name}/%{version}/bootstrap.sh -# Fix char warning -# https://issues.apache.org/jira/browse/THRIFT-5350 -Patch0: thrift-char.patch # fix configure.ac insistence on using /usr/local/lib for JAVA_PREFIX Patch2: configure-java-prefix.patch @@ -455,6 +452,9 @@ find %{buildroot} -name \*.py -exec grep -q /usr/bin/env {} \; -print | xargs -r %changelog +* Thu Jun 15 2023 Orion Poplawski - 0.15.0-1 +- Update to 0.15.0 + * Tue Jun 13 2023 Python Maint - 0.14.0-14 - Rebuilt for Python 3.12 From acc001c47a556fbe1e3cfd0382ffd7a9b42a3449 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Fri, 16 Jun 2023 10:05:49 -0600 Subject: [PATCH 32/44] Re-enable LTO, seems to be working again --- thrift.spec | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/thrift.spec b/thrift.spec index 2f12495..d1039ff 100644 --- a/thrift.spec +++ b/thrift.spec @@ -3,11 +3,6 @@ # 9223372036854775800] [-Werror=free-nonheap-object] # https://bugzilla.redhat.com/show_bug.cgi?id=2046213 # -# Fails to build with gcc 12 -# https://issues.apache.org/jira/browse/THRIFT-5498 -# -# Work around this for now by disabling LTO: -%global _lto_cflags %{nil} %global php_extdir %(php-config --extension-dir 2>/dev/null || echo "undefined") @@ -76,7 +71,7 @@ # change is a SONAME change and dependencies need to be rebuilt Name: thrift Version: 0.15.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Software framework for cross-language services development # Parts of the source are used under the BSD and zlib licenses, but @@ -452,6 +447,9 @@ find %{buildroot} -name \*.py -exec grep -q /usr/bin/env {} \; -print | xargs -r %changelog +* Fri Jun 16 2023 Orion Poplawski - 0.15.0-2 +- Re-enable LTO, seems to be working again + * Thu Jun 15 2023 Orion Poplawski - 0.15.0-1 - Update to 0.15.0 From d89e43e7d6d0dd2badd65f40e0aa946011626eff Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jul 2023 16:16:56 +0000 Subject: [PATCH 33/44] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- thrift.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/thrift.spec b/thrift.spec index d1039ff..6cfd725 100644 --- a/thrift.spec +++ b/thrift.spec @@ -71,7 +71,7 @@ # change is a SONAME change and dependencies need to be rebuilt Name: thrift Version: 0.15.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Software framework for cross-language services development # Parts of the source are used under the BSD and zlib licenses, but @@ -447,6 +447,9 @@ find %{buildroot} -name \*.py -exec grep -q /usr/bin/env {} \; -print | xargs -r %changelog +* Sat Jul 22 2023 Fedora Release Engineering - 0.15.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Fri Jun 16 2023 Orion Poplawski - 0.15.0-2 - Re-enable LTO, seems to be working again From 4ced25563461549bbe1aa16d46b542470ed5d8b5 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jan 2024 06:04:56 +0000 Subject: [PATCH 34/44] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- thrift.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/thrift.spec b/thrift.spec index 6cfd725..b2c936d 100644 --- a/thrift.spec +++ b/thrift.spec @@ -71,7 +71,7 @@ # change is a SONAME change and dependencies need to be rebuilt Name: thrift Version: 0.15.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Software framework for cross-language services development # Parts of the source are used under the BSD and zlib licenses, but @@ -447,6 +447,9 @@ find %{buildroot} -name \*.py -exec grep -q /usr/bin/env {} \; -print | xargs -r %changelog +* Sat Jan 27 2024 Fedora Release Engineering - 0.15.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Sat Jul 22 2023 Fedora Release Engineering - 0.15.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From dcddbdde35c248238760a2d81b987e8a19fb9be9 Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Thu, 16 May 2024 14:25:07 -0400 Subject: [PATCH 35/44] Fix flatpak build Python is part of the flatpak runtime and has its own macro to locate it. Boost is not part of the runtime and therefore ends up in the same prefix. Also, use %_prefix instead of /usr in the perl install fixups. --- thrift.spec | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/thrift.spec b/thrift.spec index b2c936d..f2cbc36 100644 --- a/thrift.spec +++ b/thrift.spec @@ -333,8 +333,8 @@ sed -i 's|$(INSTALL) $$p|$(INSTALL) --mode 644 $$p|g' lib/erl/Makefile.am sh ./bootstrap.sh # use unversioned doc dirs where appropriate (via _pkgdocdir macro) -export PYTHON=%{_bindir}/python3 -%configure --disable-dependency-tracking --disable-static --with-boost=/usr \ +export PYTHON=%{__python3} +%configure --disable-dependency-tracking --disable-static --with-boost=%{_prefix} \ --docdir=%{?_pkgdocdir}%{!?_pkgdocdir:%{_docdir}/%{name}-%{version}} \ %{java_configure} %{ruby_configure} %{erlang_configure} %{golang_configure} %{php_configure} %{lua_configure} @@ -365,9 +365,9 @@ find %{buildroot} -name \*.jar -a \! -name \*thrift\* -exec rm -f '{}' \; # Move perl files into appropriate places find %{buildroot} -name \*.pod -exec rm -f '{}' \; find %{buildroot} -name .packlist -exec rm -f '{}' \; -find %{buildroot}/usr/lib/perl5 -type d -empty -delete +find %{buildroot}%{_prefix}/lib/perl5 -type d -empty -delete mkdir -p %{buildroot}/%{perl_vendorlib}/ -mv %{buildroot}/usr/lib/perl5/* %{buildroot}/%{perl_vendorlib} +mv %{buildroot}%{_prefix}/lib/perl5/* %{buildroot}/%{perl_vendorlib} %if 0%{?want_php} != 0 From 42d21678117cf792cb62383098c08476184e67bc Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Thu, 16 May 2024 21:37:49 -0600 Subject: [PATCH 36/44] Update to 0.20.0 --- .gitignore | 1 + libthrift-0.15.0.pom => libthrift-0.20.0.pom | 65 +++++++++----------- sources | 2 +- thrift.spec | 7 ++- 4 files changed, 36 insertions(+), 39 deletions(-) rename libthrift-0.15.0.pom => libthrift-0.20.0.pom (51%) diff --git a/.gitignore b/.gitignore index 7f5d81c..2a688c5 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /thrift-0.13.0.tar.gz /thrift-0.14.0.tar.gz /thrift-0.15.0.tar.gz +/thrift-0.20.0.tar.gz diff --git a/libthrift-0.15.0.pom b/libthrift-0.20.0.pom similarity index 51% rename from libthrift-0.15.0.pom rename to libthrift-0.20.0.pom index 26547ce..7cc8e43 100644 --- a/libthrift-0.15.0.pom +++ b/libthrift-0.20.0.pom @@ -1,10 +1,15 @@ - + + + + + 4.0.0 org.apache.thrift libthrift - 0.15.0 + 0.20.0 Apache Thrift Thrift is a software framework for scalable cross-language services development. http://thrift.apache.org @@ -31,50 +36,38 @@ org.slf4j slf4j-api - 1.7.28 - compile + 1.7.36 + runtime - org.apache.httpcomponents - httpclient - 4.5.10 - compile + org.apache.httpcomponents.client5 + httpclient5 + 5.2.1 + runtime - org.apache.httpcomponents - httpcore - 4.4.12 - compile + org.apache.httpcomponents.core5 + httpcore5 + 5.2 + runtime - javax.servlet - javax.servlet-api - 4.0.1 - provided + jakarta.servlet + jakarta.servlet-api + 5.0.0 + runtime - javax.annotation - javax.annotation-api - 1.3.2 - compile + jakarta.annotation + jakarta.annotation-api + 2.1.1 + runtime - junit - junit - 4.12 - test - - - org.mockito - mockito-all - 1.10.19 - test - - - org.slf4j - slf4j-log4j12 - 1.7.28 - test + org.apache.commons + commons-lang3 + 3.12.0 + runtime diff --git a/sources b/sources index 38878fe..458d2a6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (thrift-0.15.0.tar.gz) = 37e48d1872c85abc92ae86017f98bb092ac2b64e46be21ed6fa0b72d46cf956257efcc7db344b55aa9a70f9a9741d400081c1b78f1eb8d72c9e53a196f3e62ef +SHA512 (thrift-0.20.0.tar.gz) = 8dc77f666e60141a6b3cf7ee1407b08a0e80d176f8ccfee69317d7df89ab87aea2c7b3ba3e59d4561835edf1ce23762443ad5aeed0099bf075b010853d5eb1cd diff --git a/thrift.spec b/thrift.spec index f2cbc36..9dcf33b 100644 --- a/thrift.spec +++ b/thrift.spec @@ -70,8 +70,8 @@ # NOTE: thrift versions their libraries by package version, so each version # change is a SONAME change and dependencies need to be rebuilt Name: thrift -Version: 0.15.0 -Release: 4%{?dist} +Version: 0.20.0 +Release: 1%{?dist} Summary: Software framework for cross-language services development # Parts of the source are used under the BSD and zlib licenses, but @@ -447,6 +447,9 @@ find %{buildroot} -name \*.py -exec grep -q /usr/bin/env {} \; -print | xargs -r %changelog +* Fri May 17 2024 Orion Poplawski - 0.20.0-1 +- Update to 0.20.0 + * Sat Jan 27 2024 Fedora Release Engineering - 0.15.0-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 029eb5b076a5dfae522f219c6710c409b837c6e6 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Sat, 8 Jun 2024 22:34:18 +0200 Subject: [PATCH 37/44] Rebuilt for Python 3.13 --- thrift.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/thrift.spec b/thrift.spec index 9dcf33b..ec7a354 100644 --- a/thrift.spec +++ b/thrift.spec @@ -71,7 +71,7 @@ # change is a SONAME change and dependencies need to be rebuilt Name: thrift Version: 0.20.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Software framework for cross-language services development # Parts of the source are used under the BSD and zlib licenses, but @@ -447,6 +447,9 @@ find %{buildroot} -name \*.py -exec grep -q /usr/bin/env {} \; -print | xargs -r %changelog +* Sat Jun 08 2024 Python Maint - 0.20.0-2 +- Rebuilt for Python 3.13 + * Fri May 17 2024 Orion Poplawski - 0.20.0-1 - Update to 0.20.0 From 5a6065456a1252ec2399b6c375d2304fd5ab7e36 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 20 Jul 2024 07:24:12 +0000 Subject: [PATCH 38/44] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- thrift.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/thrift.spec b/thrift.spec index ec7a354..6b62f8b 100644 --- a/thrift.spec +++ b/thrift.spec @@ -71,7 +71,7 @@ # change is a SONAME change and dependencies need to be rebuilt Name: thrift Version: 0.20.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Software framework for cross-language services development # Parts of the source are used under the BSD and zlib licenses, but @@ -447,6 +447,9 @@ find %{buildroot} -name \*.py -exec grep -q /usr/bin/env {} \; -print | xargs -r %changelog +* Sat Jul 20 2024 Fedora Release Engineering - 0.20.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Sat Jun 08 2024 Python Maint - 0.20.0-2 - Rebuilt for Python 3.13 From 99d304634a8a0737c0fdf2e62495e2c15c9b3fcb Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 19 Jan 2025 12:45:33 +0000 Subject: [PATCH 39/44] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- thrift.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/thrift.spec b/thrift.spec index 6b62f8b..2c4e7a1 100644 --- a/thrift.spec +++ b/thrift.spec @@ -71,7 +71,7 @@ # change is a SONAME change and dependencies need to be rebuilt Name: thrift Version: 0.20.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Software framework for cross-language services development # Parts of the source are used under the BSD and zlib licenses, but @@ -447,6 +447,9 @@ find %{buildroot} -name \*.py -exec grep -q /usr/bin/env {} \; -print | xargs -r %changelog +* Sun Jan 19 2025 Fedora Release Engineering - 0.20.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Sat Jul 20 2024 Fedora Release Engineering - 0.20.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From 2a9d5eb2dfe9b55c82cd621fbfd136e630bc8014 Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Tue, 18 Mar 2025 23:29:17 -0400 Subject: [PATCH 40/44] Fix build with GCC 15 https://github.com/apache/thrift/pull/3078 --- gcc15.patch | 47 +++++++++++++++++++++++++++++++++++++++++++++++ thrift.spec | 2 ++ 2 files changed, 49 insertions(+) create mode 100644 gcc15.patch diff --git a/gcc15.patch b/gcc15.patch new file mode 100644 index 0000000..2f3294c --- /dev/null +++ b/gcc15.patch @@ -0,0 +1,47 @@ +From 1920f04398ca32e320f6cf942534ba9d8b3231fd Mon Sep 17 00:00:00 2001 +From: Sutou Kouhei +Date: Mon, 23 Dec 2024 12:33:22 +0900 +Subject: [PATCH] THRIFT-5842: Add missing cstdint include for int64_t in + Mutex.h + +Client: cpp + +GCC 15 (not released yet) requires `#include ` for `int64_t` +but `lib/cpp/src/thrift/concurrency/Mutex.h` doesn't have it. So we +can't build Thrift with GCC 15: + + [80/359] Building CXX object lib/cpp/CMakeFiles/thrift.dir/src/thrift/transport/TSSLServerSocket.cpp.o + FAILED: lib/cpp/CMakeFiles/thrift.dir/src/thrift/transport/TSSLServerSocket.cpp.o + /bin/g++-15 -DBOOST_ALL_DYN_LINK -DBOOST_TEST_DYN_LINK -DTHRIFT_STATIC_DEFINE -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS -I/home/kou/work/cpp/thrift.kou.build/lib/cpp -I/home/kou/work/cpp/thrift.kou/lib/cpp -I/home/kou/work/cpp/thrift.kou.build -I/home/kou/work/cpp/thrift.kou/lib/cpp/src -g -std=c++11 -MD -MT lib/cpp/CMakeFiles/thrift.dir/src/thrift/transport/TSSLServerSocket.cpp.o -MF lib/cpp/CMakeFiles/thrift.dir/src/thrift/transport/TSSLServerSocket.cpp.o.d -o lib/cpp/CMakeFiles/thrift.dir/src/thrift/transport/TSSLServerSocket.cpp.o -c /home/kou/work/cpp/thrift.kou/lib/cpp/src/thrift/transport/TSSLServerSocket.cpp + In file included from /home/kou/work/cpp/thrift.kou/lib/cpp/src/thrift/transport/TServerSocket.h:25, + from /home/kou/work/cpp/thrift.kou/lib/cpp/src/thrift/transport/TSSLServerSocket.h:23, + from /home/kou/work/cpp/thrift.kou/lib/cpp/src/thrift/transport/TSSLServerSocket.cpp:21: + /home/kou/work/cpp/thrift.kou/lib/cpp/src/thrift/concurrency/Mutex.h:47:26: error: 'int64_t' has not been declared + 47 | virtual bool timedlock(int64_t milliseconds) const; + | ^~~~~~~ + /home/kou/work/cpp/thrift.kou/lib/cpp/src/thrift/concurrency/Mutex.h:25:1: note: 'int64_t' is defined in header ''; this is probably fixable by adding '#include ' + 24 | #include + +++ |+#include + 25 | + /home/kou/work/cpp/thrift.kou/lib/cpp/src/thrift/concurrency/Mutex.h:60:29: error: 'int64_t' has not been declared + 60 | Guard(const Mutex& value, int64_t timeout = 0) : mutex_(&value) { + | ^~~~~~~ + /home/kou/work/cpp/thrift.kou/lib/cpp/src/thrift/concurrency/Mutex.h:60:29: note: 'int64_t' is defined in header ''; this is probably fixable by adding '#include ' + +See also: https://github.com/apache/arrow/issues/45096 +--- + lib/cpp/src/thrift/concurrency/Mutex.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/lib/cpp/src/thrift/concurrency/Mutex.h b/lib/cpp/src/thrift/concurrency/Mutex.h +index 1e5c3fba37c..12f1729d6bf 100644 +--- a/lib/cpp/src/thrift/concurrency/Mutex.h ++++ b/lib/cpp/src/thrift/concurrency/Mutex.h +@@ -20,6 +20,7 @@ + #ifndef _THRIFT_CONCURRENCY_MUTEX_H_ + #define _THRIFT_CONCURRENCY_MUTEX_H_ 1 + ++#include + #include + #include + diff --git a/thrift.spec b/thrift.spec index 2c4e7a1..389edf5 100644 --- a/thrift.spec +++ b/thrift.spec @@ -91,6 +91,8 @@ Source2: https://raw.github.com/apache/%{name}/%{version}/bootstrap.sh # fix configure.ac insistence on using /usr/local/lib for JAVA_PREFIX Patch2: configure-java-prefix.patch +# fix build with GCC 15: https://github.com/apache/thrift/pull/3078 +Patch3: gcc15.patch # BuildRequires for language-specific bindings are listed under these From a727f7d8283cb50192d86fc19c24d52b4822fdda Mon Sep 17 00:00:00 2001 From: Python Maint Date: Tue, 3 Jun 2025 14:30:38 +0200 Subject: [PATCH 41/44] Rebuilt for Python 3.14 --- thrift.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/thrift.spec b/thrift.spec index 389edf5..ea31be2 100644 --- a/thrift.spec +++ b/thrift.spec @@ -71,7 +71,7 @@ # change is a SONAME change and dependencies need to be rebuilt Name: thrift Version: 0.20.0 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Software framework for cross-language services development # Parts of the source are used under the BSD and zlib licenses, but @@ -449,6 +449,9 @@ find %{buildroot} -name \*.py -exec grep -q /usr/bin/env {} \; -print | xargs -r %changelog +* Tue Jun 03 2025 Python Maint - 0.20.0-5 +- Rebuilt for Python 3.14 + * Sun Jan 19 2025 Fedora Release Engineering - 0.20.0-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 1f82334fa8a0f767669927201bff4c3aa64c1499 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 19:16:25 +0000 Subject: [PATCH 42/44] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- thrift.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/thrift.spec b/thrift.spec index ea31be2..1994e67 100644 --- a/thrift.spec +++ b/thrift.spec @@ -71,7 +71,7 @@ # change is a SONAME change and dependencies need to be rebuilt Name: thrift Version: 0.20.0 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Software framework for cross-language services development # Parts of the source are used under the BSD and zlib licenses, but @@ -449,6 +449,9 @@ find %{buildroot} -name \*.py -exec grep -q /usr/bin/env {} \; -print | xargs -r %changelog +* Fri Jul 25 2025 Fedora Release Engineering - 0.20.0-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Tue Jun 03 2025 Python Maint - 0.20.0-5 - Rebuilt for Python 3.14 From fb39649d7444313a6f781e82672a02c7f70842be Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 15 Aug 2025 15:20:11 +0200 Subject: [PATCH 43/44] Rebuilt for Python 3.14.0rc2 bytecode --- thrift.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/thrift.spec b/thrift.spec index 1994e67..309f4be 100644 --- a/thrift.spec +++ b/thrift.spec @@ -71,7 +71,7 @@ # change is a SONAME change and dependencies need to be rebuilt Name: thrift Version: 0.20.0 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Software framework for cross-language services development # Parts of the source are used under the BSD and zlib licenses, but @@ -449,6 +449,9 @@ find %{buildroot} -name \*.py -exec grep -q /usr/bin/env {} \; -print | xargs -r %changelog +* Fri Aug 15 2025 Python Maint - 0.20.0-7 +- Rebuilt for Python 3.14.0rc2 bytecode + * Fri Jul 25 2025 Fedora Release Engineering - 0.20.0-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From 30c84913389c9e426ab264b736b39e816a4393f3 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 19 Sep 2025 14:59:34 +0200 Subject: [PATCH 44/44] Rebuilt for Python 3.14.0rc3 bytecode --- thrift.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/thrift.spec b/thrift.spec index 309f4be..dc82a8e 100644 --- a/thrift.spec +++ b/thrift.spec @@ -71,7 +71,7 @@ # change is a SONAME change and dependencies need to be rebuilt Name: thrift Version: 0.20.0 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Software framework for cross-language services development # Parts of the source are used under the BSD and zlib licenses, but @@ -449,6 +449,9 @@ find %{buildroot} -name \*.py -exec grep -q /usr/bin/env {} \; -print | xargs -r %changelog +* Fri Sep 19 2025 Python Maint - 0.20.0-8 +- Rebuilt for Python 3.14.0rc3 bytecode + * Fri Aug 15 2025 Python Maint - 0.20.0-7 - Rebuilt for Python 3.14.0rc2 bytecode