Use thrift source archive from packages.debian.org

rules/thrift_0_13_0.mk

@@ -1,16 +1,17 @@
 # thrift package
 
 THRIFT_VERSION_0_13_0 = 0.13.0
+THRIFT_VERSION_0_13_0_FULL = $(THRIFT_VERSION_0_13_0)-6
 
-LIBTHRIFT_0_13_0 = libthrift_$(THRIFT_VERSION_0_13_0)_$(CONFIGURED_ARCH).deb
+LIBTHRIFT_0_13_0 = libthrift-$(THRIFT_VERSION_0_13_0)_$(THRIFT_VERSION_0_13_0_FULL)_$(CONFIGURED_ARCH).deb
 $(LIBTHRIFT_0_13_0)_SRC_PATH = $(SRC_PATH)/thrift_0_13_0
 SONIC_MAKE_DEBS += $(LIBTHRIFT_0_13_0)
 
-LIBTHRIFT_DEV_0_13_0 = libthrift-dev_$(THRIFT_VERSION_0_13_0)_$(CONFIGURED_ARCH).deb
+LIBTHRIFT_DEV_0_13_0 = libthrift-dev_$(THRIFT_VERSION_0_13_0_FULL)_$(CONFIGURED_ARCH).deb
 $(eval $(call add_derived_package,$(LIBTHRIFT_0_13_0),$(LIBTHRIFT_DEV_0_13_0)))
 
-PYTHON_THRIFT_0_13_0 = python-thrift_$(THRIFT_VERSION_0_13_0)_$(CONFIGURED_ARCH).deb
+PYTHON3_THRIFT_0_13_0 = python3-thrift_$(THRIFT_VERSION_0_13_0_FULL)_$(CONFIGURED_ARCH).deb
 $(eval $(call add_derived_package,$(LIBTHRIFT_0_13_0),$(PYTHON_THRIFT_0_13_0)))
 
-THRIFT_COMPILER_0_13_0 = thrift-compiler_$(THRIFT_VERSION_0_13_0)_$(CONFIGURED_ARCH).deb
+THRIFT_COMPILER_0_13_0 = thrift-compiler_$(THRIFT_VERSION_0_13_0_FULL)_$(CONFIGURED_ARCH).deb
 $(eval $(call add_derived_package,$(LIBTHRIFT_0_13_0),$(THRIFT_COMPILER_0_13_0)))

src/thrift_0_13_0/0001-Disable-unneeded-packages.patch

@@ -0,0 +1,114 @@
+From f30c1065a5e11ad1e8abc89e8e119d015db45d91 Mon Sep 17 00:00:00 2001
+From: Myron Sosyak <[email protected]>
+Date: Tue, 10 Aug 2021 09:35:31 +0000
+Subject: [PATCH] Disable unneeded packages
+
+---
+ .../thrift-0.13.0/debian/control              | 54 +++++++++----------
+ src/thrift_0_13_0/thrift-0.13.0/debian/rules  |  9 ++--
+ 2 files changed, 31 insertions(+), 32 deletions(-)
+
+diff --git a/src/thrift_0_13_0/thrift-0.13.0/debian/control b/src/thrift_0_13_0/thrift-0.13.0/debian/control
+index 5126e472b..b0044dae3 100644
+--- a/src/thrift_0_13_0/thrift-0.13.0/debian/control
++++ b/src/thrift_0_13_0/thrift-0.13.0/debian/control
+@@ -13,8 +13,8 @@ Build-Depends: debhelper-compat (= 11), dh-python,
+  python3-all-dev,
+  python3-six,
+  golang-go, golang-github-golang-mock-dev,
+- pkg-php-tools (>= 1.14~), php-dev, phpunit, php-codesniffer,
+- perl (>= 5.22), libbit-vector-perl, libclass-accessor-perl,
++#  pkg-php-tools (>= 1.14~), php-dev, phpunit, php-codesniffer,
++#  perl (>= 5.22), libbit-vector-perl, libclass-accessor-perl,
+ # openjdk-11-jdk, javahelper, maven-debian-helper (>= 1.5), ant (>= 1.7), ant-optional,
+ # libhttpclient-java, libslf4j-java, libservlet3.1-java (>= 8),
+ # nodejs, npm,
+@@ -175,32 +175,32 @@ Description: Python library for Thrift (debug symbols)
+ # .
+ # This package contains Javadoc HTML documentation for libthrift-java .
+ #
+-Package: php-thrift
+-Architecture: any
+-Section: php
+-Depends: ${phpcomposer:Debian-require}, ${shlibs:Depends}, ${misc:Depends}
+-Provides: ${php:Provides}
+-Conflicts: php7.0-thrift, php7.2-thrift
+-Replaces: php7.0-thrift, php7.2-thrift
+-Description: PHP language support for Thrift
+- Thrift is a software framework for the development of reliable and
+- performant communication and data serialization. It combines a software
+- stack with code generation to build services that operate seamlessly
+- across a number of different development languages.
+- .
+- This package provides the PHP5 language support for Thrift.
++# Package: php-thrift
++# Architecture: any
++# Section: php
++# Depends: ${phpcomposer:Debian-require}, ${shlibs:Depends}, ${misc:Depends}
++# Provides: ${php:Provides}
++# Conflicts: php7.0-thrift, php7.2-thrift
++# Replaces: php7.0-thrift, php7.2-thrift
++# Description: PHP language support for Thrift
++#  Thrift is a software framework for the development of reliable and
++#  performant communication and data serialization. It combines a software
++#  stack with code generation to build services that operate seamlessly
++#  across a number of different development languages.
++#  .
++#  This package provides the PHP5 language support for Thrift.
+
+-Package: libthrift-perl
+-Section: perl
+-Architecture: all
+-Depends: ${perl:Depends}, ${misc:Depends}
+-Description: Perl language support for Thrift
+- Thrift is a software framework for the development of reliable and
+- performant communication and data serialization. It combines a software
+- stack with code generation to build services that operate seamlessly
+- across a number of different development languages.
+- .
+- This package provides the Perl language support for Thrift.
++# Package: libthrift-perl
++# Section: perl
++# Architecture: all
++# Depends: ${perl:Depends}, ${misc:Depends}
++# Description: Perl language support for Thrift
++#  Thrift is a software framework for the development of reliable and
++#  performant communication and data serialization. It combines a software
++#  stack with code generation to build services that operate seamlessly
++#  across a number of different development languages.
++#  .
++#  This package provides the Perl language support for Thrift.
+
+ Package: golang-thrift-dev
+ Architecture: amd64 arm64 armel armhf i386 ppc64el
+diff --git a/src/thrift_0_13_0/thrift-0.13.0/debian/rules b/src/thrift_0_13_0/thrift-0.13.0/debian/rules
+index 3056eba9c..8217796d9 100755
+--- a/src/thrift_0_13_0/thrift-0.13.0/debian/rules
++++ b/src/thrift_0_13_0/thrift-0.13.0/debian/rules
+@@ -46,8 +46,7 @@ override_dh_auto_clean:
+ 		$(CURDIR)/test/go/src/golang.org/x/net \
+ 		$(CURDIR)/lib/go/test/gopath/src/golang.org/x/net \
+ 		$(CURDIR)/lib/go/test/gopath/src/github.com/golang/mock
+-	[ ! -f Makefile ] || $(MAKE)
+-	cd $(CURDIR)/lib/php/src/ext/thrift_protocol/ && phpize --clean
++	[ ! -f Makefile ] || $(MAKE) clean
+ 	find $(CURDIR) \( -name Makefile -o -name Makefile.in \) -exec rm {} \;
+ 	find $(CURDIR) -name .dirstamp -exec rm {} \;
+ 	$(RM) aclocal.m4 config.h config.log config.status configure \
+@@ -65,10 +64,10 @@ override_dh_auto_clean:
+
+ override_dh_auto_configure:
+ 	dh_auto_configure -- \
+-		--with-cpp --with-c_glib --with-php --with-php_extension \
+-		--with-perl --without-python --with-py3 --without-java \
++		--with-cpp --with-c_glib --without-php --without-php_extension \
++		--without-perl --without-python --with-py3 --without-java \
+ 		--without-nodejs --without-erlang --without-lua \
+-		--with-go --with-ruby \
++		--without-go --without-ruby \
+ 		--with-qt4=no --with-qt5=yes \
+ 		--without-rust \
+ 		--disable-tutorial
+--
+2.17.1
+

src/thrift_0_13_0/Makefile

@@ -3,21 +3,23 @@ SHELL = /bin/bash
 .SHELLFLAGS += -e
 
 THRIFT_VERSION = 0.13.0
+THRIFT_VERSION_FULL = $(THRIFT_VERSION)-6
 
-MAIN_TARGET = libthrift_$(THRIFT_VERSION)_$(CONFIGURED_ARCH).deb
-DERIVED_TARGETS = libthrift-dev_$(THRIFT_VERSION)_$(CONFIGURED_ARCH).deb \
-		  python-thrift_$(THRIFT_VERSION)_$(CONFIGURED_ARCH).deb \
-		  thrift-compiler_$(THRIFT_VERSION)_$(CONFIGURED_ARCH).deb
+MAIN_TARGET = libthrift-$(THRIFT_VERSION)_$(THRIFT_VERSION_FULL)_$(CONFIGURED_ARCH).deb
+DERIVED_TARGETS = libthrift-dev_$(THRIFT_VERSION_FULL)_$(CONFIGURED_ARCH).deb \
+		  python3-thrift_$(THRIFT_VERSION_FULL)_$(CONFIGURED_ARCH).deb \
+		  thrift-compiler_$(THRIFT_VERSION_FULL)_$(CONFIGURED_ARCH).deb
 
-THRIFT_ARCHIVE_URL = https://github.com/apache/thrift/archive/refs/tags/v$(THRIFT_VERSION).tar.gz
+THRIFT_LINK_PRE = http://deb.debian.org/debian/pool/main/t/thrift/
 
 $(addprefix $(DEST)/, $(MAIN_TARGET)): $(DEST)/% :
-	rm -rf thrift-$(THRIFT_VERSION)*
+	rm -rf thrift-$(THRIFT_VERSION)
 
-	wget "$(THRIFT_ARCHIVE_URL)" -O thrift-$(THRIFT_VERSION).tar.gz
-	tar -xf thrift-$(THRIFT_VERSION).tar.gz --exclude="debian"
-	cp -r debian thrift-$(THRIFT_VERSION)/debian
+	wget "$(THRIFT_LINK_PRE)/thrift_$(THRIFT_VERSION_FULL).debian.tar.xz"
+	wget "$(THRIFT_LINK_PRE)/thrift_$(THRIFT_VERSION).orig.tar.gz"
+	wget "$(THRIFT_LINK_PRE)/thrift_$(THRIFT_VERSION_FULL).dsc"
 
+	dpkg-source -x thrift_$(THRIFT_VERSION_FULL).dsc
 	pushd thrift-$(THRIFT_VERSION)
 
 	DEB_BUILD_OPTIONS=nocheck dpkg-buildpackage -d -rfakeroot -b -us -uc -j$(SONIC_CONFIG_MAKE_JOBS) --admindir $(SONIC_DPKG_ADMINDIR)