fix(deps): Fix dependencies for Debian Buster

Signed-off-by: Gaurav Mishra <mishra.gaurav@siemens.com>
fossology · Sep 5, 2019 · 41fe2b4 · 41fe2b4
1 parent 4a0c2e9
commit 41fe2b4
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 15 deletions.
diff --git a/debian/control b/debian/control
@@ -6,13 +6,14 @@ Build-Depends: debhelper (>=9~), libglib2.0-dev, libmagic-dev, libxml2-dev,
  libmxml-dev, libtext-template-perl, librpm-dev, subversion, rpm, libpcre3-dev,
  libssl-dev, postgresql-server-dev-all, libboost-regex-dev,
  libboost-program-options-dev, libjsoncpp-dev, libjson-c-dev,
- php5-cli|php7.0-cli|php7.2-cli, php-mbstring|php5, php-zip|php5, php-xml|php5, libboost-system-dev, libboost-filesystem-dev
+ php5-cli|php7.0-cli|php7.2-cli|php7.3-cli, php-mbstring|php5, php-zip|php5,
+ php-xml|php5, libboost-system-dev, libboost-filesystem-dev
 Standards-Version: 3.9.1
 Homepage: https://fossology.org
 
 Package: fossology-dev
 Architecture: any
-Depends: php5-cli|php7.0-cli|php7.2-cli, ${misc:Depends}
+Depends: php5-cli|php7.0-cli|php7.2-cli|php7.3-cli, ${misc:Depends}
 Description: architecture for analyzing software, development utils
  The FOSSology project is a web based framework that allows you to
  upload software to be picked apart and then analyzed by software agents
@@ -45,10 +46,10 @@ Description: open and modular architecture for analyzing software
 
 Package: fossology-common
 Architecture: any
-Depends: php5-pgsql|php7.0-pgsql|php7.2-pgsql, php-pear,
- php5-cli|php7.0-cli|php7.2-cli, php5-json|php7.0-json|php7.2-json,
- php-mbstring|php5, php-zip|php5, php-xml|php5, ${shlibs:Depends},
- ${misc:Depends}
+Depends: php5-pgsql|php7.0-pgsql|php7.2-pgsql|php7.3-pgsql, php-pear,
+ php5-cli|php7.0-cli|php7.2-cli|php7.3-cli, php-mbstring|php5,
+ php5-json|php7.0-json|php7.2-json|php7.3-json, php-zip|php5, php-xml|php5,
+ ${shlibs:Depends}, ${misc:Depends}
 Description: architecture for analyzing software, common files
  The FOSSology project is a web based framework that allows you to
  upload software to be picked apart and then analyzed by software agents
@@ -62,7 +63,7 @@ Description: architecture for analyzing software, common files
 Package: fossology-web
 Architecture: any
 Depends: fossology-common, fossology-decider, apache2,
- libapache2-mod-php5|libapache2-mod-php7.0|libapache2-mod-php7.2,
+ libapache2-mod-php5|libapache2-mod-php7.0|libapache2-mod-php7.2|libapache2-mod-php7.3,
  ${misc:Depends}
 Recommends: fossology-db
 Description: architecture for analyzing software, web interface

diff --git a/src/ojo/mod_deps b/src/ojo/mod_deps
@@ -102,12 +102,14 @@ if [[ $RUNTIME ]]; then
           apt-get $YesOpt install libjsoncpp0 libboost-filesystem1.55.0 libboost-program-options1.55.0 libboost-regex1.55.0;;
         stretch)
           apt-get $YesOpt install libjsoncpp1 libboost-filesystem1.62.0 libboost-program-options1.62.0 libboost-regex1.62.0;;
-        buster|sid)
+        buster)
           apt-get $YesOpt install libjsoncpp1 libboost-filesystem1.67.0 libboost-program-options1.67.0 libboost-regex1.67.0;;
         xenial)
           apt-get $YesOpt install libjsoncpp1 libboost-filesystem1.58.0 libboost-program-options1.58.0 libboost-regex1.58.0;;
         bionic)
           apt-get $YesOpt install libjsoncpp1 libboost-filesystem1.65.1 libboost-program-options1.65.1 libboost-regex1.65.1;;
+        sid)
+          apt-get $YesOpt install libjsoncpp1 libboost-filesystem1.67.0 libboost-program-options1.67.0 libboost-regex1.67.0;;
         *) echo "ERROR: Unknown or Unsupported $DISTRO $CODENAME release, please report to the mailing list"; exit 1;;
       esac;;
     Fedora)

diff --git a/utils/fo-installdeps b/utils/fo-installdeps
@@ -104,23 +104,29 @@ if [[ $BUILDTIME ]]; then
             libmxml-dev curl libxml2-dev libcunit1-dev \
             build-essential libtext-template-perl subversion rpm librpm-dev libmagic-dev libglib2.0 libboost-regex-dev libboost-program-options-dev
          case "$CODENAME" in
-           xenial)
-             apt-get $YesOpt install php-mbstring php7.0-zip;;
-           stretch|buster|sid)
+           xenial|stretch)
              apt-get $YesOpt install php-mbstring php7.0-xml php7.0-zip;;
+           buster)
+             apt-get $YesOpt install php-mbstring php7.3-xml php7.3-zip;;
            bionic)
              apt-get $YesOpt install php-mbstring php7.2-xml php7.2-zip;;
+           sid)
+             apt-get $YesOpt install php-mbstring php-xml php-zip;;
          esac
          if ! dpkg --get-selections | grep -q postgresql-server-dev; then  ## if postgresql-server-dev is not installed
            case "$CODENAME" in
               jessie)
                 apt-get $YesOpt install postgresql-server-dev-9.4;;
               xenial)
                 apt-get $YesOpt install postgresql-server-dev-9.5;;
-              stretch|buster|sid)
+              stretch)
                 apt-get $YesOpt install postgresql-server-dev-9.6;;
+              buster)
+                apt-get $YesOpt install postgresql-server-dev-11;;
               bionic)
                 apt-get $YesOpt install postgresql-server-dev-10;;
+              sid)
+                apt-get $YesOpt install postgresql-server-dev-11;;
               *) echo "ERROR: Unknown or Unsupported $DISTRO $CODENAME release, please report to the mailing list"; exit 1;;
            esac
          fi
@@ -168,10 +174,14 @@ if [[ $RUNTIME ]]; then
                apt-get $YesOpt install postgresql-9.4 libapache2-mod-php5 php5 php5-pgsql php5-cli php5-curl heirloom-mailx libboost-program-options1.55.0 libboost-regex1.55.0;;
             xenial)
                apt-get $YesOpt install postgresql-9.5 php7.0 libapache2-mod-php7.0 php7.0-pgsql php7.0-cli php7.0-curl php7.0-mbstring php7.0-zip s-nail libboost-program-options1.58.0 libboost-regex1.58.0;;
-            stretch|buster|sid)
-               apt-get $YesOpt install postgresql-9.6 php7.0 php7.0-pgsql php7.0-cli php7.0-curl php7.0-xml php7.0-zip php-mbstring s-nail libboost-program-options1.62.0 libboost-regex1.62.0;;
+            stretch)
+               apt-get $YesOpt install postgresql-9.6 php7.0 libapache2-mod-php7.0 php7.0-pgsql php7.0-cli php7.0-curl php7.0-xml php7.0-zip php7.0-mbstring s-nail libboost-program-options1.62.0 libboost-regex1.62.0;;
+            buster)
+               apt-get $YesOpt install postgresql-11 php7.3 libapache2-mod-php7.3 php7.3-pgsql php7.3-cli php7.3-curl php7.3-xml php7.3-zip php7.3-mbstring s-nail libboost-program-options1.67.0 libboost-regex1.67.0;;
             bionic)
-               apt-get $YesOpt install postgresql-10 php7.2 php7.2-pgsql php7.2-cli php7.2-curl php7.2-xml php7.2-zip php7.2-mbstring s-nail libboost-program-options1.65.1 libboost-regex1.65.1;;
+               apt-get $YesOpt install postgresql-10 php7.2 libapache2-mod-php7.2 php7.2-pgsql php7.2-cli php7.2-curl php7.2-xml php7.2-zip php7.2-mbstring s-nail libboost-program-options1.65.1 libboost-regex1.65.1;;
+            sid)
+               apt-get $YesOpt install postgresql php php-pgsql php-cli php-curl php-xml php-zip php-mbstring s-nail libboost-program-options1.67.0 libboost-regex1.67.0;;
             *) echo "ERROR: Unknown or Unsupported $DISTRO $CODENAME release, please report to the mailing list"; exit 1;;
          esac
          ;;