diff --git a/install-php-extensions b/install-php-extensions index 579c268..0986e71 100755 --- a/install-php-extensions +++ b/install-php-extensions @@ -567,14 +567,6 @@ buildRequiredPackageLists() { buildRequiredPackageLists_volatile="$buildRequiredPackageLists_volatile libpcre3-dev" fi ;; - odbc@alpine) - buildRequiredPackageLists_persistent="$buildRequiredPackageLists_persistent unixodbc" - buildRequiredPackageLists_volatile="$buildRequiredPackageLists_volatile unixodbc-dev" - ;; - odbc@debian) - buildRequiredPackageLists_persistent="$buildRequiredPackageLists_persistent libodbc1" - buildRequiredPackageLists_volatile="$buildRequiredPackageLists_volatile unixodbc-dev" - ;; oci8@alpine | pdo_oci@alpine) buildRequiredPackageLists_persistent="$buildRequiredPackageLists_persistent libaio libc6-compat libnsl" if test $DISTRO_MAJMIN_VERSION -le 307; then @@ -586,6 +578,14 @@ buildRequiredPackageLists() { buildRequiredPackageLists_persistent="$buildRequiredPackageLists_persistent libaio[0-9]*$" buildRequiredPackageLists_volatile="$buildRequiredPackageLists_volatile unzip" ;; + odbc@alpine) + buildRequiredPackageLists_persistent="$buildRequiredPackageLists_persistent unixodbc" + buildRequiredPackageLists_volatile="$buildRequiredPackageLists_volatile unixodbc-dev" + ;; + odbc@debian) + buildRequiredPackageLists_persistent="$buildRequiredPackageLists_persistent libodbc1" + buildRequiredPackageLists_volatile="$buildRequiredPackageLists_volatile unixodbc-dev" + ;; pdo_dblib@alpine) buildRequiredPackageLists_persistent="$buildRequiredPackageLists_persistent freetds" buildRequiredPackageLists_volatile="$buildRequiredPackageLists_volatile freetds-dev" @@ -686,13 +686,6 @@ buildRequiredPackageLists() { esac fi ;; - snuffleupagus@alpine) - buildRequiredPackageLists_persistent="$buildRequiredPackageLists_persistent pcre" - buildRequiredPackageLists_volatile="$buildRequiredPackageLists_volatile pcre-dev" - ;; - snuffleupagus@debian) - buildRequiredPackageLists_volatile="$buildRequiredPackageLists_volatile libpcre3-dev" - ;; snmp@alpine) buildRequiredPackageLists_persistent="$buildRequiredPackageLists_persistent net-snmp-libs" buildRequiredPackageLists_volatile="$buildRequiredPackageLists_volatile net-snmp-dev" @@ -701,6 +694,13 @@ buildRequiredPackageLists() { buildRequiredPackageLists_persistent="$buildRequiredPackageLists_persistent snmp" buildRequiredPackageLists_volatile="$buildRequiredPackageLists_volatile libsnmp-dev" ;; + snuffleupagus@alpine) + buildRequiredPackageLists_persistent="$buildRequiredPackageLists_persistent pcre" + buildRequiredPackageLists_volatile="$buildRequiredPackageLists_volatile pcre-dev" + ;; + snuffleupagus@debian) + buildRequiredPackageLists_volatile="$buildRequiredPackageLists_volatile libpcre3-dev" + ;; soap@alpine) buildRequiredPackageLists_volatile="$buildRequiredPackageLists_volatile libxml2-dev" ;; @@ -776,18 +776,18 @@ buildRequiredPackageLists() { uuid@debian) buildRequiredPackageLists_volatile="$buildRequiredPackageLists_volatile uuid-dev" ;; - xlswriter@alpine) - buildRequiredPackageLists_volatile="$buildRequiredPackageLists_volatile zlib-dev" - ;; - xlswriter@debian) - buildRequiredPackageLists_volatile="$buildRequiredPackageLists_volatile zlib1g-dev" - ;; wddx@alpine) buildRequiredPackageLists_volatile="$buildRequiredPackageLists_volatile libxml2-dev" ;; wddx@debian) buildRequiredPackageLists_volatile="$buildRequiredPackageLists_volatile libxml2-dev" ;; + xlswriter@alpine) + buildRequiredPackageLists_volatile="$buildRequiredPackageLists_volatile zlib-dev" + ;; + xlswriter@debian) + buildRequiredPackageLists_volatile="$buildRequiredPackageLists_volatile zlib1g-dev" + ;; xmlrpc@alpine) buildRequiredPackageLists_volatile="$buildRequiredPackageLists_volatile libxml2-dev" ;; @@ -1461,6 +1461,13 @@ installRemoteModule() { cp "$installRemoteModule_src/$installRemoteModule_so" "$(getPHPExtensionsDir)/$installRemoteModule_module.so" installRemoteModule_manuallyInstalled=1 ;; + mailparse) + if test -z "$installRemoteModule_version"; then + if test $PHP_MAJMIN_VERSION -lt 700; then + installRemoteModule_version=2.1.6 + fi + fi + ;; memcache) if test -z "$installRemoteModule_version"; then if test $PHP_MAJMIN_VERSION -lt 700; then @@ -1470,13 +1477,6 @@ installRemoteModule() { fi fi ;; - mailparse) - if test -z "$installRemoteModule_version"; then - if test $PHP_MAJMIN_VERSION -lt 700; then - installRemoteModule_version=2.1.6 - fi - fi - ;; memcached) if test -z "$installRemoteModule_version"; then if test $PHP_MAJMIN_VERSION -lt 700; then @@ -1847,6 +1847,15 @@ installRemoteModule() { rm "$PHP_INI_DIR/conf.d/tdlib.ini" installRemoteModule_manuallyInstalled=1 ;; + uopz) + if test -z "$installRemoteModule_version"; then + if test $PHP_MAJMIN_VERSION -lt 700; then + installRemoteModule_version=2.0.7 + elif test $PHP_MAJMIN_VERSION -lt 701; then + installRemoteModule_version=5.0.2 + fi + fi + ;; uuid) if test -z "$installRemoteModule_version"; then if test $PHP_MAJMIN_VERSION -le 506; then @@ -1871,15 +1880,6 @@ installRemoteModule() { fi fi ;; - uopz) - if test -z "$installRemoteModule_version"; then - if test $PHP_MAJMIN_VERSION -lt 700; then - installRemoteModule_version=2.0.7 - elif test $PHP_MAJMIN_VERSION -lt 701; then - installRemoteModule_version=5.0.2 - fi - fi - ;; xhprof) if test -z "$installRemoteModule_version"; then if test $PHP_MAJMIN_VERSION -le 506; then