From 19d66be0aa81d0be6f805b0c8b759f121bf93a7e Mon Sep 17 00:00:00 2001
From: Robin Sommer <robin@icir.org>
Date: Mon, 1 Aug 2016 08:32:41 -0700
Subject: [PATCH] Removing pkg/make-*-packages scripts.

We aren't using them anymore for the packages we distribute. Because
of that, they haven't been supported in a while, and have problems.

BIT-1509 #closed
---
 CHANGES               |  5 ++++
 NEWS                  |  5 ++++
 VERSION               |  2 +-
 pkg/make-deb-packages | 46 ----------------------------------
 pkg/make-mac-packages | 57 -------------------------------------------
 pkg/make-rpm-packages | 39 -----------------------------
 6 files changed, 11 insertions(+), 143 deletions(-)
 delete mode 100755 pkg/make-deb-packages
 delete mode 100755 pkg/make-mac-packages
 delete mode 100755 pkg/make-rpm-packages

diff --git a/CHANGES b/CHANGES
index 1f72911215..3f9b96ef5f 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,9 @@
 
+2.4-732 | 2016-08-01 08:33:00 -0700
+
+  * Removing pkg/make-*-packages scripts. BIT-1509 #closed (Robin
+    Sommer)
+
 2.4-731 | 2016-08-01 08:14:06 -0700
 
   * Correct endianness of IP addresses in SNMP. Addresses BIT-1644.
diff --git a/NEWS b/NEWS
index eff5ec8ad6..13542d73d7 100644
--- a/NEWS
+++ b/NEWS
@@ -191,6 +191,11 @@ Removed Functionality
     - The command line options --set-seed and --md5-hashkey have been
       removed.
 
+    - The packaging scripts pkg/make-*-packages are gone. They aren't
+      used anymore for the binary Bro packages that the projects
+      distributes; haven't been supported in a while; and have
+      problems.
+
 Deprecated Functionality
 ------------------------
 
diff --git a/VERSION b/VERSION
index c7e8fbeda0..8cae8eeb0a 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.4-731
+2.4-732
diff --git a/pkg/make-deb-packages b/pkg/make-deb-packages
deleted file mode 100755
index 36bd62c19c..0000000000
--- a/pkg/make-deb-packages
+++ /dev/null
@@ -1,46 +0,0 @@
-#!/bin/sh
-
-# This script generates binary DEB packages.
-# They can be found in ../build/ after running.
-
-# The DEB CPack generator depends on `dpkg-shlibdeps` to automatically
-# determine what dependencies to set for the packages
-type dpkg-shlibdeps > /dev/null 2>&1 || {
-    echo "\
-Creating DEB packages requires the "dpkg-shlibs" command, usually provided by
-the 'dpkg-dev' package, please install it first.
-" >&2;
-    exit 1;
-}
-
-prefix=/opt/bro
-localstatedir=/var/opt/bro
-
-# During the packaging process, `dpkg-shlibs` will fail if used on a library
-# that links to other internal/project libraries unless an RPATH is used or
-# we set LD_LIBRARY_PATH such that it can find the internal/project library
-# in the temporary packaging tree.
-export LD_LIBRARY_PATH=./${prefix}/lib
-
-cd ..
-
-# Minimum Bro
-./configure --prefix=${prefix} --disable-broccoli --disable-broctl \
-            --pkg-name-prefix=Bro-minimal --binary-package
-( cd build && make package )
-
-# Full Bro package
-./configure --prefix=${prefix} --localstatedir=${localstatedir} --pkg-name-prefix=Bro --binary-package
-( cd build && make package )
-
-# Broccoli
-cd aux/broccoli
-./configure --prefix=${prefix} --binary-package
-( cd build && make package && mv *.deb ../../../build/ )
-cd ../..
-
-# Broctl
-cd aux/broctl
-./configure --prefix=${prefix} --localstatedir=${localstatedir} --binary-package
-( cd build && make package && mv *.deb ../../../build/ )
-cd ../..
diff --git a/pkg/make-mac-packages b/pkg/make-mac-packages
deleted file mode 100755
index b3d200842f..0000000000
--- a/pkg/make-mac-packages
+++ /dev/null
@@ -1,57 +0,0 @@
-#!/bin/sh
-
-# This script creates binary packages for Mac OS X.
-# They can be found in ../build/ after running.
-
-type sw_vers > /dev/null 2>&1 || {
-    echo "Unable to get Mac OS X version" >&2;
-    exit 1;
-}
-
-# Get the OS X minor version
-# 5 = Leopard, 6 = Snow Leopard, 7 = Lion ...
-osx_ver=`sw_vers | sed -n 's/ProductVersion://p' | cut -d . -f 2`
-
-if [ ${osx_ver} -lt 5 ]; then
-    echo "Packages for OS X < 10.5 are not supported" >&2
-    exit 1
-elif [ ${osx_ver} -eq 5 ]; then
-    # On OS X 10.5, the x86_64 version of libresolv is broken,
-    # so we build for i386 as the easiest solution
-    arch=i386
-else
-    # Currently it's just easiest to build the 10.5 package on
-    # on 10.5, but if it weren't for the libresolv issue, we could
-    # potentially build packages for older OS X version by using the
-    # --osx-sysroot and --osx-min-version options
-    arch=x86_64
-fi
-
-prefix=/opt/bro
-
-cd ..
-
-# Minimum Bro
-CMAKE_PREFIX_PATH=/usr CMAKE_OSX_ARCHITECTURES=${arch} ./configure --prefix=${prefix} \
-    --disable-broccoli --disable-broctl --pkg-name-prefix=Bro-minimal \
-    --binary-package
-( cd build && make package )
-
-# Full Bro package
-CMAKE_PREFIX_PATH=/usr CMAKE_OSX_ARCHITECTURES=${arch} ./configure --prefix=${prefix} \
-    --pkg-name-prefix=Bro --binary-package
-( cd build && make package )
-
-# Broccoli
-cd aux/broccoli
-CMAKE_PREFIX_PATH=/usr CMAKE_OSX_ARCHITECTURES=${arch} ./configure --prefix=${prefix} \
-    --binary-package
-( cd build && make package && mv *.dmg ../../../build/ )
-cd ../..
-
-# Broctl
-cd aux/broctl
-CMAKE_PREFIX_PATH=/usr CMAKE_OSX_ARCHITECTURES=${arch} ./configure --prefix=${prefix} \
-    --binary-package
-( cd build && make package && mv *.dmg ../../../build/ )
-cd ../..
diff --git a/pkg/make-rpm-packages b/pkg/make-rpm-packages
deleted file mode 100755
index ee09511e44..0000000000
--- a/pkg/make-rpm-packages
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/bin/sh
-
-# This script generates binary RPM packages.
-# They can be found in ../build/ after running.
-
-# The RPM CPack generator depends on `rpmbuild` to create packages
-type rpmbuild > /dev/null 2>&1 || {
-    echo "\
-Creating RPM packages requires the "rpmbuild" command, usually provided by
-the 'rpm-build' package, please install it first.
-" >&2;
-    exit 1;
-}
-
-prefix=/opt/bro
-localstatedir=/var/opt/bro
-
-cd ..
-
-# Minimum Bro
-./configure --prefix=${prefix} --disable-broccoli --disable-broctl \
-            --pkg-name-prefix=Bro-minimal --binary-package
-( cd build && make package )
-
-# Full Bro package
-./configure --prefix=${prefix} --localstatedir=${localstatedir} --pkg-name-prefix=Bro --binary-package
-( cd build && make package )
-
-# Broccoli
-cd aux/broccoli
-./configure --prefix=${prefix} --binary-package
-( cd build && make package && mv *.rpm ../../../build/ )
-cd ../..
-
-# Broctl
-cd aux/broctl
-./configure --prefix=${prefix} --localstatedir=${localstatedir} --binary-package
-( cd build && make package && mv *.rpm ../../../build/ )
-cd ../..