From b84eb30ca222ea0fe1213fe81620b5c4a8702c08 Mon Sep 17 00:00:00 2001
From: Quanah Gibson-Mount <quanah@zimbra.com>
Date: Sat, 7 May 2016 16:37:44 -0700
Subject: [PATCH 1/7] Fix local package overrides for platforms, broken during
 reorg

---
 def/package.def | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/def/package.def b/def/package.def
index a3d3b8b..13ef7d8 100644
--- a/def/package.def
+++ b/def/package.def
@@ -62,11 +62,11 @@ endif
 PKG_APPEND ?= $(PKG_APPEND.$(BUILD_PLATFORM))
 
 # Platform specific package overrides
-ifneq ($(wildcard $(DEF_ROOT)/$(BUILD_DISTRIBUTION).def), )
-	include $(DEF_ROOT)/$(BUILD_DISTRIBUTION).def
+ifneq ($(wildcard $(BUILD_DISTRIBUTION).def), )
+	include $(BUILD_DISTRIBUTION).def
 endif
-ifneq ($(wildcard $(DEF_ROOT)/$(BUILD_PLATFORM).def), )
-	include $(DEF_ROOT)/$(BUILD_PLATFORM).def
+ifneq ($(wildcard $(BUILD_PLATFORM).def), )
+	include $(BUILD_PLATFORM).def
 endif
 
 define generic-setup

From 8468e4c768e1712a71a4c8b89ae52a3abfecb586 Mon Sep 17 00:00:00 2001
From: Shriram V <shriram.vishwanathan@synacor.com>
Date: Sat, 24 Jun 2017 06:35:13 -0500
Subject: [PATCH 2/7] Adding PKG_OS_TAG (as a future replacement for ZAPPEND),
 to add to RPM/DEB release tag

---
 def/package-RHEL.def   | 2 ++
 def/package-UBUNTU.def | 3 +++
 def/package.def        | 4 +++-
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/def/package-RHEL.def b/def/package-RHEL.def
index b017f03..4a757ac 100644
--- a/def/package-RHEL.def
+++ b/def/package-RHEL.def
@@ -2,3 +2,5 @@ include $(DEF_ROOT)/package-rpm.def
 
 PKG_APPEND.RHEL7_64 = .el7
 PKG_APPEND.RHEL6_64 = .el6
+PKG_OS_TAG.RHEL7_64 = r7
+PKG_OS_TAG.RHEL6_64 = r6
diff --git a/def/package-UBUNTU.def b/def/package-UBUNTU.def
index 42c6913..c9497be 100644
--- a/def/package-UBUNTU.def
+++ b/def/package-UBUNTU.def
@@ -3,3 +3,6 @@ include $(DEF_ROOT)/package-deb.def
 PKG_APPEND.UBUNTU16_64 := .16.04
 PKG_APPEND.UBUNTU14_64 := .14.04
 PKG_APPEND.UBUNTU12_64 := .12.04
+PKG_OS_TAG.UBUNTU16_64 := u16
+PKG_OS_TAG.UBUNTU14_64 := u14
+PKG_OS_TAG.UBUNTU12_64 := u12
diff --git a/def/package.def b/def/package.def
index 13ef7d8..87b1373 100644
--- a/def/package.def
+++ b/def/package.def
@@ -53,6 +53,7 @@ PKG_ITERATION = 1$(PKG_REVISION)
 # - PKG_DEV
 # - PKG_LIB
 # - PKG_APPEND
+# - PKG_OS_TAG
 BUILD_DISTRIBUTION := $(shell $(SED) -e 's/[0-9]*_[0-9]*$$//' <<< $(BUILD_PLATFORM))
 ifneq ($(wildcard $(DEF_ROOT)/package-$(BUILD_DISTRIBUTION).def), )
 	include $(DEF_ROOT)/package-$(BUILD_DISTRIBUTION).def
@@ -60,6 +61,7 @@ else
 	include $(error unsupported BUILD_PLATFORM $(BUILD_PLATFORM))
 endif
 PKG_APPEND ?= $(PKG_APPEND.$(BUILD_PLATFORM))
+PKG_OS_TAG ?= $(PKG_OS_TAG.$(BUILD_PLATFORM))
 
 # Platform specific package overrides
 ifneq ($(wildcard $(BUILD_DISTRIBUTION).def), )
@@ -80,7 +82,7 @@ endef
 
 # $pkg.spec OR $pkg/debian/{changelog,*.shlibs}
 define replace-pkginfo
-  $(PERL) -pi -e 's|VERSION|$(pvers)|; s|ITERATION|$(PKG_ITERATION)|; s|ZAPPEND|$(PKG_APPEND)|'
+  $(PERL) -pi -e 's|VERSION|$(pvers)|g; s|ITERATION|$(PKG_ITERATION)|g; s|PKG_OS_TAG|$(PKG_OS_TAG)|g; s|ZAPPEND|$(PKG_APPEND)|g'
 endef
 
 # $pkg.spec OR $pkg/debian/rules

From e024c605cbf3471e9b123dc738c699f760b4ffb5 Mon Sep 17 00:00:00 2001
From: Shriram V <shriram.vishwanathan@syncor.com>
Date: Tue, 18 Jul 2017 06:08:25 -0500
Subject: [PATCH 3/7] Do not sign changes files (they will be signed while
 pushing into repository)

---
 def/package-deb.def | 2 +-
 def/package.def     | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/def/package-deb.def b/def/package-deb.def
index 1d8b09b..8fec5ad 100644
--- a/def/package-deb.def
+++ b/def/package-deb.def
@@ -1,6 +1,6 @@
 PKG_EXT := deb
 
-PKG_BUILD := dpkg-buildpackage -irpm
+PKG_BUILD := dpkg-buildpackage -irpm -us -uc
 PKG_EXTRACT := sudo apt-get --assume-yes --verbose-versions install
 PKG_PURGE := sudo apt-get --assume-yes --purge purge
 PKG_DEV := dev
diff --git a/def/package.def b/def/package.def
index 87b1373..9e5b58d 100644
--- a/def/package.def
+++ b/def/package.def
@@ -80,7 +80,7 @@ define generic-clean
   $(RM) -rf $(PLATFORM_DIR)
 endef
 
-# $pkg.spec OR $pkg/debian/{changelog,*.shlibs}
+# $pkg.spec OR $pkg/debian/{changelog,*.shlibs,control}
 define replace-pkginfo
   $(PERL) -pi -e 's|VERSION|$(pvers)|g; s|ITERATION|$(PKG_ITERATION)|g; s|PKG_OS_TAG|$(PKG_OS_TAG)|g; s|ZAPPEND|$(PKG_APPEND)|g'
 endef
@@ -95,7 +95,7 @@ define replace-dictinfo
   $(PERL) -pi -e 's/ADICT/$(dictver)/g;'
 endef
 
-# $pkg.spec OR $pkg/debian/{changelog, control, copyright, watch}
+# $pkg.spec OR $pkg/debian/{changelog,control,copyright,watch}
 define replace-perl-modinfo
   $(PERL) -pi -e 's/MODNAME/$(pname)/g; s/MODNORMNAME/$(pname_lc)/g;'
 endef

From 1cd01247630140ec71f635ff18535754b7f12ea5 Mon Sep 17 00:00:00 2001
From: Amit Srivastava <amit.srivastava@synacor.com>
Date: Wed, 26 Sep 2018 12:35:04 +0530
Subject: [PATCH 4/7] ZCS-6046: Defination of ubuntu 18 added

---
 bin/get_plat_tag.sh    | 4 ++++
 def/package-UBUNTU.def | 2 ++
 2 files changed, 6 insertions(+)

diff --git a/bin/get_plat_tag.sh b/bin/get_plat_tag.sh
index 9c58110..2f098e3 100755
--- a/bin/get_plat_tag.sh
+++ b/bin/get_plat_tag.sh
@@ -140,6 +140,10 @@ if [ -f /etc/lsb-release ]; then
       echo "16${i}"
       exit 0
     fi
+    if [ "$RELEASE" = "bionic" ]; then
+      echo "18${i}"
+      exit 0
+    fi
     echo "UNKNOWN${i}"
     exit 0
   fi
diff --git a/def/package-UBUNTU.def b/def/package-UBUNTU.def
index c9497be..3c0d383 100644
--- a/def/package-UBUNTU.def
+++ b/def/package-UBUNTU.def
@@ -1,8 +1,10 @@
 include $(DEF_ROOT)/package-deb.def
 
+PKG_APPEND.UBUNTU18_64 := .18.04
 PKG_APPEND.UBUNTU16_64 := .16.04
 PKG_APPEND.UBUNTU14_64 := .14.04
 PKG_APPEND.UBUNTU12_64 := .12.04
+PKG_OS_TAG.UBUNTU18_64 := u18
 PKG_OS_TAG.UBUNTU16_64 := u16
 PKG_OS_TAG.UBUNTU14_64 := u14
 PKG_OS_TAG.UBUNTU12_64 := u12

From 779f6a29823e4bd21c4a48d726e6d6573ca57e7b Mon Sep 17 00:00:00 2001
From: Shriram V <shriram.vishwanathan@synacor.com>
Date: Sat, 24 Jun 2017 06:35:13 -0500
Subject: [PATCH 5/7] Adding PKG_OS_TAG (as a future replacement for ZAPPEND),
 to add to RPM/DEB release tag

---
 def/package-RHEL.def   | 2 ++
 def/package-UBUNTU.def | 3 +++
 def/package.def        | 4 +++-
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/def/package-RHEL.def b/def/package-RHEL.def
index b017f03..4a757ac 100644
--- a/def/package-RHEL.def
+++ b/def/package-RHEL.def
@@ -2,3 +2,5 @@ include $(DEF_ROOT)/package-rpm.def
 
 PKG_APPEND.RHEL7_64 = .el7
 PKG_APPEND.RHEL6_64 = .el6
+PKG_OS_TAG.RHEL7_64 = r7
+PKG_OS_TAG.RHEL6_64 = r6
diff --git a/def/package-UBUNTU.def b/def/package-UBUNTU.def
index 42c6913..c9497be 100644
--- a/def/package-UBUNTU.def
+++ b/def/package-UBUNTU.def
@@ -3,3 +3,6 @@ include $(DEF_ROOT)/package-deb.def
 PKG_APPEND.UBUNTU16_64 := .16.04
 PKG_APPEND.UBUNTU14_64 := .14.04
 PKG_APPEND.UBUNTU12_64 := .12.04
+PKG_OS_TAG.UBUNTU16_64 := u16
+PKG_OS_TAG.UBUNTU14_64 := u14
+PKG_OS_TAG.UBUNTU12_64 := u12
diff --git a/def/package.def b/def/package.def
index 13ef7d8..87b1373 100644
--- a/def/package.def
+++ b/def/package.def
@@ -53,6 +53,7 @@ PKG_ITERATION = 1$(PKG_REVISION)
 # - PKG_DEV
 # - PKG_LIB
 # - PKG_APPEND
+# - PKG_OS_TAG
 BUILD_DISTRIBUTION := $(shell $(SED) -e 's/[0-9]*_[0-9]*$$//' <<< $(BUILD_PLATFORM))
 ifneq ($(wildcard $(DEF_ROOT)/package-$(BUILD_DISTRIBUTION).def), )
 	include $(DEF_ROOT)/package-$(BUILD_DISTRIBUTION).def
@@ -60,6 +61,7 @@ else
 	include $(error unsupported BUILD_PLATFORM $(BUILD_PLATFORM))
 endif
 PKG_APPEND ?= $(PKG_APPEND.$(BUILD_PLATFORM))
+PKG_OS_TAG ?= $(PKG_OS_TAG.$(BUILD_PLATFORM))
 
 # Platform specific package overrides
 ifneq ($(wildcard $(BUILD_DISTRIBUTION).def), )
@@ -80,7 +82,7 @@ endef
 
 # $pkg.spec OR $pkg/debian/{changelog,*.shlibs}
 define replace-pkginfo
-  $(PERL) -pi -e 's|VERSION|$(pvers)|; s|ITERATION|$(PKG_ITERATION)|; s|ZAPPEND|$(PKG_APPEND)|'
+  $(PERL) -pi -e 's|VERSION|$(pvers)|g; s|ITERATION|$(PKG_ITERATION)|g; s|PKG_OS_TAG|$(PKG_OS_TAG)|g; s|ZAPPEND|$(PKG_APPEND)|g'
 endef
 
 # $pkg.spec OR $pkg/debian/rules

From 6efbcafe8a89a56dd0255aa4a38de5826b6cadc2 Mon Sep 17 00:00:00 2001
From: Shriram V <shriram.vishwanathan@syncor.com>
Date: Tue, 18 Jul 2017 06:08:25 -0500
Subject: [PATCH 6/7] Do not sign changes files (they will be signed while
 pushing into repository)

---
 def/package-deb.def | 2 +-
 def/package.def     | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/def/package-deb.def b/def/package-deb.def
index 1d8b09b..8fec5ad 100644
--- a/def/package-deb.def
+++ b/def/package-deb.def
@@ -1,6 +1,6 @@
 PKG_EXT := deb
 
-PKG_BUILD := dpkg-buildpackage -irpm
+PKG_BUILD := dpkg-buildpackage -irpm -us -uc
 PKG_EXTRACT := sudo apt-get --assume-yes --verbose-versions install
 PKG_PURGE := sudo apt-get --assume-yes --purge purge
 PKG_DEV := dev
diff --git a/def/package.def b/def/package.def
index 87b1373..9e5b58d 100644
--- a/def/package.def
+++ b/def/package.def
@@ -80,7 +80,7 @@ define generic-clean
   $(RM) -rf $(PLATFORM_DIR)
 endef
 
-# $pkg.spec OR $pkg/debian/{changelog,*.shlibs}
+# $pkg.spec OR $pkg/debian/{changelog,*.shlibs,control}
 define replace-pkginfo
   $(PERL) -pi -e 's|VERSION|$(pvers)|g; s|ITERATION|$(PKG_ITERATION)|g; s|PKG_OS_TAG|$(PKG_OS_TAG)|g; s|ZAPPEND|$(PKG_APPEND)|g'
 endef
@@ -95,7 +95,7 @@ define replace-dictinfo
   $(PERL) -pi -e 's/ADICT/$(dictver)/g;'
 endef
 
-# $pkg.spec OR $pkg/debian/{changelog, control, copyright, watch}
+# $pkg.spec OR $pkg/debian/{changelog,control,copyright,watch}
 define replace-perl-modinfo
   $(PERL) -pi -e 's/MODNAME/$(pname)/g; s/MODNORMNAME/$(pname_lc)/g;'
 endef

From 664855871ef92fe8ed2acf1a467eea4cf361e0e3 Mon Sep 17 00:00:00 2001
From: Amit Srivastava <amit.srivastava@synacor.com>
Date: Wed, 26 Sep 2018 12:35:04 +0530
Subject: [PATCH 7/7] ZCS-6046: Defination of ubuntu 18 added

---
 bin/get_plat_tag.sh    | 4 ++++
 def/package-UBUNTU.def | 2 ++
 2 files changed, 6 insertions(+)

diff --git a/bin/get_plat_tag.sh b/bin/get_plat_tag.sh
index 9c58110..2f098e3 100755
--- a/bin/get_plat_tag.sh
+++ b/bin/get_plat_tag.sh
@@ -140,6 +140,10 @@ if [ -f /etc/lsb-release ]; then
       echo "16${i}"
       exit 0
     fi
+    if [ "$RELEASE" = "bionic" ]; then
+      echo "18${i}"
+      exit 0
+    fi
     echo "UNKNOWN${i}"
     exit 0
   fi
diff --git a/def/package-UBUNTU.def b/def/package-UBUNTU.def
index c9497be..3c0d383 100644
--- a/def/package-UBUNTU.def
+++ b/def/package-UBUNTU.def
@@ -1,8 +1,10 @@
 include $(DEF_ROOT)/package-deb.def
 
+PKG_APPEND.UBUNTU18_64 := .18.04
 PKG_APPEND.UBUNTU16_64 := .16.04
 PKG_APPEND.UBUNTU14_64 := .14.04
 PKG_APPEND.UBUNTU12_64 := .12.04
+PKG_OS_TAG.UBUNTU18_64 := u18
 PKG_OS_TAG.UBUNTU16_64 := u16
 PKG_OS_TAG.UBUNTU14_64 := u14
 PKG_OS_TAG.UBUNTU12_64 := u12