debian: delete unused files out of debian/

These are unused and not referenced anywhere.

debian/rules.orig: included by mistake
debian/watch: no longer applicable; url is not valid
debian/patches: stale, unused, misleading

Signed-off-by: Silas McCroskey <smccroskey@cumulusnetworks.com>

12 files changed, 1 insertions, 298 deletions

diff --git a/debian/Makefile.am b/debian/Makefile.am
index 5555a3e01..6078b6a1f 100644
--- a/debian/Makefile.am
+++ b/debian/Makefile.am
@@ -2,7 +2,7 @@
 EXTRA_DIST = README.Debian README.Maintainer \
 	changelog compat control copyright \
 	rules source/format tests/control \
-	tests/daemons watch watchfrr.rc \
+	tests/daemons watchfrr.rc \
 	backports/README backports/rules \
 	backports/ubuntu12.04/debian/control \
 	backports/ubuntu12.04/debian/frr.install \
@@ -20,11 +20,6 @@ EXTRA_DIST = README.Debian README.Maintainer \
 	backports/ubuntu16.04/debian/source/format \
 	backports/ubuntu16.04/exclude \
 	backports/ubuntu16.04/versionext \
-	patches/50_vtysh__vtysh.conf.sample.diff \
-	patches/75_vtysh__vtysh.c__PAGER.diff \
-	patches/80_vtysh__vtysh.c__privs.diff \
-	patches/82_vtysh__vtysh_user.c__pam.diff \
-	patches/90_configure_ncurses.diff patches/series \
 	po/POTFILES.in po/cs.po po/da.po po/de.po po/es.po po/fr.po \
 	po/it.po po/ja.po po/nl.po po/pt.po po/pt_BR.po po/ru.po \
 	po/sv.po po/templates.pot \
diff --git a/debian/backports/ubuntu12.04/exclude b/debian/backports/ubuntu12.04/exclude
index 6857a8d44..e69de29bb 100644
--- a/debian/backports/ubuntu12.04/exclude
+++ b/debian/backports/ubuntu12.04/exclude
@@ -1 +0,0 @@
-debian/patches
diff --git a/debian/backports/ubuntu14.04/exclude b/debian/backports/ubuntu14.04/exclude
index 6857a8d44..e69de29bb 100644
--- a/debian/backports/ubuntu14.04/exclude
+++ b/debian/backports/ubuntu14.04/exclude
@@ -1 +0,0 @@
-debian/patches
diff --git a/debian/backports/ubuntu16.04/exclude b/debian/backports/ubuntu16.04/exclude
index 6857a8d44..e69de29bb 100644
--- a/debian/backports/ubuntu16.04/exclude
+++ b/debian/backports/ubuntu16.04/exclude
@@ -1 +0,0 @@
-debian/patches
diff --git a/debian/patches/50_vtysh__vtysh.conf.sample.diff b/debian/patches/50_vtysh__vtysh.conf.sample.diff
deleted file mode 100644
index d60581f70..000000000
--- a/debian/patches/50_vtysh__vtysh.conf.sample.diff
+++ /dev/null
@@ -1,16 +0,0 @@
-Description: Change example to make it compatible with the Debian init scripts
-  per default.
-Author: Christian Hammers <ch@debian.org>
-
---- old/vtysh/vtysh.conf.sample.orig	2004-10-30 23:07:40.000000000 +0200
-+++ new/vtysh/vtysh.conf.sample	2004-10-30 23:08:24.000000000 +0200
-@@ -1,7 +1,7 @@
- !
- ! Sample configuration file for vtysh.
- !
--!service integrated-vtysh-config
-+service integrated-vtysh-config
- !hostname quagga-router
--!username root nopassword
-+username root nopassword
- !
diff --git a/debian/patches/75_vtysh__vtysh.c__PAGER.diff b/debian/patches/75_vtysh__vtysh.c__PAGER.diff
deleted file mode 100644
index 2dbf6b244..000000000
--- a/debian/patches/75_vtysh__vtysh.c__PAGER.diff
+++ /dev/null
@@ -1,26 +0,0 @@
-Description: Use the pager program that was choosen with the Debian
-  update-alternative system. (Updated line numbers for 0.99.22)
-Author: Christian Hammers <ch@debian.org>
-
---- old/vtysh/vtysh.c.orig	2004-10-18 01:23:16.000000000 +0200
-+++ new/vtysh/vtysh.c	2004-10-18 01:25:15.000000000 +0200
-@@ -265,10 +265,16 @@
- 
-   pager_defined = getenv ("VTYSH_PAGER");
- 
--  if (pager_defined)
-+  if (pager_defined) {
-     vtysh_pager_name = strdup (pager_defined);
--  else
--    vtysh_pager_name = strdup ("more");
-+  } else {
-+    struct stat pager_stat;
-+    if (stat("/usr/bin/pager", &pager_stat) == 0) {
-+      vtysh_pager_name = strdup ("/usr/bin/pager");
-+    } else {
-+      vtysh_pager_name = strdup ("more");
-+    }
-+  }
- }
- 
- /* Command execution over the vty interface. */
diff --git a/debian/patches/80_vtysh__vtysh.c__privs.diff b/debian/patches/80_vtysh__vtysh.c__privs.diff
deleted file mode 100644
index 863c81391..000000000
--- a/debian/patches/80_vtysh__vtysh.c__privs.diff
+++ /dev/null
@@ -1,59 +0,0 @@
-Description: Fixes group permission. (line numbers adjusted for 0.99.22)
-
-Index: quagga-0.99.23.1/vtysh/vtysh.c
-===================================================================
---- quagga-0.99.23.1.orig/vtysh/vtysh.c	2015-04-16 07:58:08.000000000 -0700
-+++ quagga-0.99.23.1/vtysh/vtysh.c	2015-04-16 08:02:16.108035000 -0700
-@@ -26,6 +26,8 @@
- #include <sys/wait.h>
- #include <sys/resource.h>
- #include <sys/stat.h>
-+#include <sys/types.h>
-+#include <grp.h>
- 
- #include <readline/readline.h>
- #include <readline/history.h>
-@@ -2026,6 +2028,9 @@
-   char line[] = "write terminal\n";
-   FILE *fp, *fp1;
- 
-+  /* Setting file permissions */
-+  struct group *quagga_vty_group;
-+
-   fprintf (stdout,"Building Configuration...\n");
- 
-   backup_config_file(integrate_default);
-@@ -2058,16 +2063,31 @@
- 
-   fclose (fp);
- 
-+  errno = 0;
-+  if ((quagga_vty_group = getgrnam(VTY_GROUP)) == NULL)
-+    {
-+      fprintf (stdout, "%% Can't get group %s: %s (%d)\n",
-+        VTY_GROUP, strerror(errno), errno);
-+      return CMD_WARNING;
-+    }
-+
-+  if ((chown(integrate_default, -1, quagga_vty_group->gr_gid)) != 0)
-+    {
-+      fprintf (stdout,"%% Can't chown configuration file %s: %s (%d)\n",
-+	integrate_default, strerror(errno), errno);
-+      return CMD_WARNING;
-+    }
-+
-   if (chmod (integrate_default, CONFIGFILE_MASK) != 0)
-     {
--      fprintf (stdout,"%% Can't chmod configuration file %s: %s (%d)\n", 
-+      fprintf (stdout,"%% Can't chmod configuration file %s: %s (%d)\n",
- 	       integrate_default, safe_strerror(errno), errno);
-       return CMD_WARNING;
-     }
- 
-  if (chmod (host.config, CONFIGFILE_MASK) != 0)
-     {
--      fprintf (stdout,"%% Can't chmod configuration file %s: %s (%d)\n", 
-+      fprintf (stdout,"%% Can't chmod configuration file %s: %s (%d)\n",
- 	       integrate_default, safe_strerror(errno), errno);
-       return CMD_WARNING;
-     }
diff --git a/debian/patches/82_vtysh__vtysh_user.c__pam.diff b/debian/patches/82_vtysh__vtysh_user.c__pam.diff
deleted file mode 100644
index 5358ed887..000000000
--- a/debian/patches/82_vtysh__vtysh_user.c__pam.diff
+++ /dev/null
@@ -1,10 +0,0 @@
-Description: Adds explanation why vtysh does not work if PAM fails.
-Author: Christian Hammers <ch@debian.org>
-
---- old/vtysh/vtysh_user.c.orig	2006-11-03 01:53:58.000000000 +0100
-+++ new/vtysh/vtysh_user.c	2006-11-03 01:59:02.000000000 +0100
-@@ -60,2 +60,4 @@ vtysh_pam (const char *user)
-     ret = pam_authenticate (pamh, 0);
-+  if (ret != PAM_SUCCESS)
-+    printf("Not authenticated. Check /etc/pam.d/quagga.\n");
-   /* printf ("ret %d\n", ret); */
diff --git a/debian/patches/90_configure_ncurses.diff b/debian/patches/90_configure_ncurses.diff
deleted file mode 100644
index 9d3dbb15d..000000000
--- a/debian/patches/90_configure_ncurses.diff
+++ /dev/null
@@ -1,47 +0,0 @@
-Description: To make checklib happy.
- See http://rerun.lefant.net/checklib/log.quagga_0.99.5-1.html
- (adjusted for 0.99.2)
-Author: Christian Hammers <ch@debian.org>
-
---- old/configure	2011-09-27 00:30:23.000000000 +0200
-+++ new/configure	2011-09-27 00:30:28.000000000 +0200
-@@ -14207,7 +14207,8 @@
-   $as_echo_n "(cached) " >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
--LIBS="-ltermcap  $LIBS"
-+#42#DEBIAN# LIBS="-ltermcap  $LIBS"
-+LIBS="$LIBS"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- 
-@@ -14238,7 +14238,8 @@
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_termcap_tputs" >&5
- $as_echo "$ac_cv_lib_termcap_tputs" >&6; }
- if test "x$ac_cv_lib_termcap_tputs" = xyes; then :
--  LIBREADLINE="$LIBREADLINE -ltermcap"
-+  #42#DEBIAN# LIBREADLINE="$LIBREADLINE -ltermcap"
-+  LIBREADLINE="$LIBREADLINE "
- else
-   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for tputs in -ltinfo" >&5
- $as_echo_n "checking for tputs in -ltinfo... " >&6; }
-@@ -14285,7 +14289,8 @@
-   $as_echo_n "(cached) " >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
--LIBS="-lcurses  $LIBS"
-+#42#DEBIAN# LIBS="-lcurses  $LIBS"
-+LIBS="$LIBS"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- 
-@@ -14355,7 +14355,8 @@
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ncurses_tputs" >&5
- $as_echo "$ac_cv_lib_ncurses_tputs" >&6; }
- if test "x$ac_cv_lib_ncurses_tputs" = xyes; then :
--  LIBREADLINE="$LIBREADLINE -lncurses"
-+  #42#DEBIAN# LIBREADLINE="$LIBREADLINE -lncurses"
-+  LIBREADLINE="$LIBREADLINE"
- fi
- 
- 
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index b3f6cc145..000000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,5 +0,0 @@
-90_configure_ncurses.diff
-82_vtysh__vtysh_user.c__pam.diff
-80_vtysh__vtysh.c__privs.diff
-75_vtysh__vtysh.c__PAGER.diff
-50_vtysh__vtysh.conf.sample.diff
diff --git a/debian/rules.orig b/debian/rules.orig
deleted file mode 100755
index 348e7eafd..000000000
--- a/debian/rules.orig
+++ /dev/null
@@ -1,118 +0,0 @@
-#!/usr/bin/make -f
-
-export DH_VERBOSE=1
-export DEB_BUILD_HARDENING=1
-export DH_OPTIONS=-v
-
-ifeq ($(WANT_SNMP), 1)
-  USE_SNMP=--enable-snmp
-  $(warning "DEBIAN: SNMP enabled, sorry for your inconvenience")
-else
-  $(warning "DEBIAN: SNMP disabled, see README.Debian")
-endif
-
-ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
-  DEBIAN_JOBS := $(subst parallel=,,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
-endif
-
-ifdef DEBIAN_JOBS
-MAKEFLAGS += -j$(DEBIAN_JOBS)
-endif
-
-%:
-	dh $@ --with=systemd,autoreconf --parallel --dbg-package=frr-dbg --list-missing
-
-override_dh_auto_configure:
-	# Frr needs /proc to check some BSD vs Linux specific stuff.
-	# Else it fails with an obscure error message pointing out that
-	# IPCTL_FORWARDING is an undefined symbol which is not very helpful.
-	@if ! [ -d /proc/1 ]; then \
-		echo "./configure needs a mounted /proc"; \
-		exit 1; \
-	fi
-
-	if ! [ -e config.status ]; then \
-	dh_auto_configure -- \
-		--enable-exampledir=/usr/share/doc/frr/examples/ \
-		--localstatedir=/var/run/frr \
-		--sbindir=/usr/lib/frr \
-		--sysconfdir=/etc/frr \
-		$(USE_SNMP) \
-		--enable-ospfapi=yes \
-		--enable-vtysh=yes \
-		--enable-isisd=yes \
-		--enable-multipath=256 \
-		--enable-user=frr \
-		--enable-group=frr \
-		--enable-vty-group=frrvty \
-		--enable-configfile-mask=0640 \
-		--enable-logfile-mask=0640 \
-		--enable-werror \
-		--enable-gcc-rdynamic \
-		--with-libpam \
-		--enable-systemd=yes \
-		--enable-poll=yes \
-		--enable-cumulus=yes \
-		--enable-pimd=yes \
-		--enable-dependency-tracking \
-		--enable-bgp-vnc=no; \
-	fi
-
-override_dh_auto_build:
-	#dh_auto_build
-	$(MAKE)
-	dh_auto_build -- -C doc draft-zebra-00.txt
-
-
-	# doc/ is a bit crazy
-ifeq ($(GENERATE_PDF), 1)
-	dh_auto_build -- -C doc frr.pdf || true # pdfetex fails with exit code 1 but still produces a good looking .pdf
-endif
-	rm -vf doc/frr.info
-	dh_auto_build -- -C doc frr.info
-	rm -vf doc/frr.info.html*
-
-override_dh_auto_test:
-
-override_dh_auto_install:
-	dh_auto_install
-
-	# cleaning up the info dir
-	rm -f debian/tmp/usr/share/info/dir*
-
-	# install config files
-	mkdir -p debian/tmp/etc/frr/
-	perl -pi -e 's#^!log file #!log file /var/log/frr/#' debian/tmp/usr/share/doc/frr/examples/*sample*
-
-	# installing the Frr specific SNMP MIB
-	install -D -m 644 ./zebra/GNOME-PRODUCT-ZEBRA-MIB debian/tmp/usr/share/snmp/mibs/GNOME-PRODUCT-ZEBRA-MIB
-
-	# cleaning .la files
-	sed -i "/dependency_libs/ s/'.*'/''/" debian/tmp/usr/lib/*.la
-
-override_dh_systemd_start:
-	dh_systemd_start frr.service
-
-override_dh_systemd_enable:
-	dh_systemd_enable frr.service
-
-# backports
-SRCPKG = frr
-KNOWN_BACKPORTS = ubuntu12.04 ubuntu14.04 ubuntu16.04
-ORIG_VERSION := $(shell dh_testdir && grep -E < configure.ac '^AC_INIT\(.*\)' \
-		| cut -d, -f2 | xargs echo)
-DEBIAN_VERSION := $(shell dh_testdir && \
-		dpkg-parsechangelog -c1 < debian/changelog | \
-		sed -rn 's/^Version: ?//p')
--include debian/backports/rules
-
-ifneq ($(TARBALLDIR),)
-# better error message on missing .orig.tar.gz
-$(TARBALLDIR)/$(SRCPKG)_$(ORIG_VERSION).orig.tar.gz:
-	@ echo "\`$(TARBALLDIR)/$(SRCPKG)_$(ORIG_VERSION).orig.tar.gz'" not \
-		found and not generated by debian/rules. Provided you have the \
-		necessary packages installed, you can generate it yourself via \
-		"\"./bootstrap.sh && ./configure && make dist\"" \
-		and renaming the resulting file.
-	exit 1
-endif # def TARBALLDIR
diff --git a/debian/watch b/debian/watch
deleted file mode 100644
index 06c21eb2c..000000000
--- a/debian/watch
+++ /dev/null
@@ -1,8 +0,0 @@
-# Example watch control file for uscan
-# Rename this file to "watch" and then you can run the "uscan" command
-# to check for upstream updates and more.
-# Site		Directory		Pattern			Version	Script
-##version=3
-##opts=uversionmangle=s/(\d)[_\.\-\+]?((RC|rc|pre|dev|beta|alpha|b|a)[\-\.]?\d*)$/$1~$2/ \
-##    http://download.savannah.gnu.org/releases/frr/quagga-(\d.*)\.(?:tgz|tar\.(?:gz|bz2|xz))
-# Bart Martens <bartm@debian.org>  Fri, 25 Jan 2013 06:38:53 +0000