From b73b9ae26bbfa88fb76e9046b564e05a69eaa71b Mon Sep 17 00:00:00 2001
From: dmacias72 <derekmacias@live.com>
Date: Sat, 15 Oct 2016 10:34:42 -0600
Subject: [PATCH] update

---
 plugins/apache.plg     | 80 +++++++++++++++++++++++-------------------
 plugins/apache.xml     |  5 ++-
 plugins/libvirtwol.plg | 80 ++++++++++++++++++------------------------
 3 files changed, 83 insertions(+), 82 deletions(-)

diff --git a/plugins/apache.plg b/plugins/apache.plg
index de48c9e1..210fd655 100755
--- a/plugins/apache.plg
+++ b/plugins/apache.plg
@@ -3,13 +3,13 @@
 <!DOCTYPE PLUGIN [
 <!ENTITY name      "apache">
 <!ENTITY author    "dmacias72">
-<!ENTITY version   "2016.09.24">
+<!ENTITY version   "2016.10.15">
 <!ENTITY launch    "Settings/&name;">
 <!ENTITY gitURL    "https://raw.githubusercontent.com/&author;/unRAID-plugins/master">
 <!ENTITY pluginURL "&gitURL;/plugins/&name;.plg">
 <!ENTITY pkgURL    "&gitURL;/source/packages">
-<!ENTITY plgpath   "/boot/config/plugins/&name;">
-<!ENTITY plgname   "&name;-&version;-x86_64-1">
+<!ENTITY plgPATH   "/boot/config/plugins/&name;">
+<!ENTITY plgNAME   "&name;-&version;-x86_64-1">
 <!ENTITY emhttp    "/usr/local/emhttp/plugins/&name;">
 ]>
 
@@ -20,6 +20,9 @@ This Plugin installs and controls The Apache HTTP Server ("httpd") for unRaid 6.
 -->
 
 <CHANGES>
+###2016.10.15
+- add: min and max version to plg
+- update php extensions to 5.6.26 match unRAID 6.3
 ###2016.09.24
 - fix: apr and apr-util packages not installing
 - fix: clearing log files
@@ -73,92 +76,97 @@ This Plugin installs and controls The Apache HTTP Server ("httpd") for unRaid 6.
 - initial commit
 </CHANGES>
 
-<FILE Name="/boot/config/plugins/NerdPack/packages/6.2/apr-1.5.2-x86_64-1.txz" Run="upgradepkg --install-new">
+<FILE Name="&plgPATH;/apr-1.5.2-x86_64-1.txz" Min="6.2" Run="upgradepkg --install-new">
 <URL>&gitURL;/packages/6.2/apr-1.5.2-x86_64-1.txz</URL>
 <MD5>4076e8b7bd35e028b1cfb9224b51afc8</MD5>
 </FILE>
 
-<FILE Name="/boot/config/plugins/NerdPack/packages/6.2/apr-util-1.5.4-x86_64-2.txz" Run="upgradepkg --install-new">
+<FILE Name="&plgPATH;/apr-util-1.5.4-x86_64-2.txz" Min="6.2" Run="upgradepkg --install-new">
 <URL>&gitURL;/packages/6.2/apr-util-1.5.4-x86_64-2.txz</URL>
 <MD5>4efea0ce9975635fe82ad0a6a079d1ca</MD5>
 </FILE>
 
-<FILE Name="&plgpath;/freetype-2.6.5-x86_64-1.txz" Run="upgradepkg --install-new">
+<FILE Name="&plgPATH;/freetype-2.6.5-x86_64-1.txz" Min="6.2" Run="upgradepkg --install-new">
 <URL>&pkgURL;/freetype-2.6.5-x86_64-1.txz</URL>
 <MD5>60eb82ef3458130fc48f07e6f5035876</MD5>
 </FILE>
 
-<FILE Name="&plgpath;/harfbuzz-1.3.0-x86_64-1.txz" Run="upgradepkg --install-new">
+<FILE Name="&plgPATH;/harfbuzz-1.3.0-x86_64-1.txz" Max="6.2" Run="upgradepkg --install-new">
 <URL>&pkgURL;/harfbuzz-1.3.0-x86_64-1.txz</URL>
 <MD5>348c80202ce746b41557708bddf9c35b</MD5>
 </FILE>
 
-<FILE Name="&plgpath;/httpd-2.4.23-x86_64-1.txz" Run="upgradepkg --install-new">
+<FILE Name="&plgPATH;/httpd-2.4.23-x86_64-1.txz" Min="6.2" Run="upgradepkg --install-new">
 <URL>&pkgURL;/httpd-2.4.23-x86_64-1.txz</URL>
 <MD5>5a7a6f7ec34f23b88bd60072dcc1add9</MD5>
 </FILE>
 
-<FILE Name="&plgpath;/libiodbc-3.52.10-x86_64-2.txz" Run="upgradepkg --install-new">
+<FILE Name="&plgPATH;/libiodbc-3.52.10-x86_64-2.txz" Min="6.2" Run="upgradepkg --install-new">
 <URL>&pkgURL;/libiodbc-3.52.10-x86_64-2.txz</URL>
 <MD5>5d62962db9add60780e184c76048d3d3</MD5>
 </FILE>
 
-<FILE Name="&plgpath;/libmcrypt-2.5.8-x86_64-1.txz" Run="upgradepkg --install-new">
+<FILE Name="&plgPATH;/libmcrypt-2.5.8-x86_64-1.txz" Min="6.2" Run="upgradepkg --install-new">
 <URL>&pkgURL;/libmcrypt-2.5.8-x86_64-1.txz</URL>
 <MD5>758bfc84d60a0d1bb8c1e51caaffe50f</MD5>
 </FILE>
 
-<FILE Name="&plgpath;/libtool-2.4.6-x86_64-4.txz" Run="upgradepkg --install-new">
+<FILE Name="&plgPATH;/libtool-2.4.6-x86_64-4.txz" Min="6.2" Run="upgradepkg --install-new">
 <URL>&pkgURL;/libtool-2.4.6-x86_64-4.txz</URL>
 <MD5>3a4d8446f6025bdc06f423d719f942e8</MD5>
 </FILE>
 
-<FILE Name="&plgpath;/libvpx-1.5.0-x86_64-1.txz" Run="upgradepkg --install-new">
+<FILE Name="&plgPATH;/libvpx-1.5.0-x86_64-1.txz" Min="6.2" Run="upgradepkg --install-new">
 <URL>&pkgURL;/libvpx-1.5.0-x86_64-1.txz</URL>
 <MD5>04ee011ea0510d961d121883930c2fda</MD5>
 </FILE>
 
-<FILE Name="&plgpath;/libX11-1.6.3-x86_64-2.txz" Run="upgradepkg --install-new">
+<FILE Name="&plgPATH;/libX11-1.6.3-x86_64-2.txz" Min="6.2" Run="upgradepkg --install-new">
 <URL>&pkgURL;/libX11-1.6.3-x86_64-2.txz</URL>
 <MD5>26472fb7e9d86d3127a427f2c364623f</MD5>
 </FILE>
 
-<FILE Name="&plgpath;/libXau-1.0.8-x86_64-1.txz" Run="upgradepkg --install-new">
+<FILE Name="&plgPATH;/libXau-1.0.8-x86_64-1.txz" Min="6.2" Run="upgradepkg --install-new">
 <URL>&pkgURL;/libXau-1.0.8-x86_64-1.txz</URL>
 <MD5>b09a959ee01a1ea1d31600999b05dfef</MD5>
 </FILE>
 
-<FILE Name="&plgpath;/libxcb-1.11.1-x86_64-1.txz" Run="upgradepkg --install-new">
+<FILE Name="&plgPATH;/libxcb-1.11.1-x86_64-1.txz" Min="6.2" Run="upgradepkg --install-new">
 <URL>&pkgURL;/libxcb-1.11.1-x86_64-1.txz</URL>
 <MD5>86a2a1c5f8fa01e6c2372d3d957201c4</MD5>
 </FILE>
 
-<FILE Name="&plgpath;/libXdmcp-1.1.2-x86_64-2.txz" Run="upgradepkg --install-new">
+<FILE Name="&plgPATH;/libXdmcp-1.1.2-x86_64-2.txz" Min="6.2" Run="upgradepkg --install-new">
 <URL>&pkgURL;/libXdmcp-1.1.2-x86_64-2.txz</URL>
 <MD5>ce01ef3cc35262bb124d36e2f5c520c5</MD5>
 </FILE>
 
-<FILE Name="&plgpath;/libXpm-3.5.11-x86_64-1.txz" Run="upgradepkg --install-new">
+<FILE Name="&plgPATH;/libXpm-3.5.11-x86_64-1.txz" Min="6.2" Run="upgradepkg --install-new">
 <URL>&pkgURL;/libXpm-3.5.11-x86_64-1.txz</URL>
 <MD5>d7e67e2109a8b0e3e554187dcccf3089</MD5>
 </FILE>
 
-<FILE Name="&plgpath;/net-snmp-5.7.3-x86_64-3.txz" Run="upgradepkg --install-new">
+<FILE Name="&plgPATH;/net-snmp-5.7.3-x86_64-3.txz" Min="6.2" Run="upgradepkg --install-new">
 <URL>&pkgURL;/net-snmp-5.7.3-x86_64-3.txz</URL>
 <MD5>4e5e3b7b73388912e18205ab1f509629</MD5>
 </FILE>
 
-<FILE Name="&plgpath;/php-ext-5.6.24-x86_64-1.txz" Run="upgradepkg --install-new">
+<FILE Name="&plgPATH;/php-ext-5.6.24-x86_64-1.txz" Min="6.2" Run="upgradepkg --install-new">
 <URL>&pkgURL;/php-ext-5.6.24-x86_64-1.txz</URL>
 <MD5>b83aefdaa0904deec56e00fc6dc5def5</MD5>
 </FILE>
 
-<FILE Name="&plgpath;/t1lib-5.1.2-x86_64-3.txz" Run="upgradepkg --install-new">
+<FILE Name="&plgPATH;/php-ext-5.6.26-x86_64-1.txz" Min="6.3" Run="upgradepkg --install-new">
+<URL>&pkgURL;/php-ext-5.6.26-x86_64-1.txz</URL>
+<MD5>6caeec1b7f8bf4c29baa27b63dd46891</MD5>
+</FILE>
+
+<FILE Name="&plgPATH;/t1lib-5.1.2-x86_64-3.txz" Min="6.2" Run="upgradepkg --install-new">
 <URL>&pkgURL;/t1lib-5.1.2-x86_64-3.txz</URL>
 <MD5>6942fb6f9f78b8e3cc4a1c77469a2512</MD5>
 </FILE>
 
-<FILE Name="&plgpath;/&name;.cfg">
+<FILE Name="&plgPATH;/&name;.cfg">
 <INLINE>
 <![CDATA[
 # Apache Web Server configuration:
@@ -170,7 +178,7 @@ RUNAS="nobody"
 </INLINE>
 </FILE>
 
-<FILE Name="&plgpath;/&name;-cert.sh">
+<FILE Name="&plgPATH;/&name;-cert.sh">
 <INLINE>
 <![CDATA[
 openssl req -new -x509 -keyout /boot/config/plugins/apache/server.crt -out /boot/config/plugins/apache/server.crt -days 365 -nodes; chmod 600 /boot/config/plugins/apache/server.crt
@@ -181,15 +189,15 @@ openssl req -new -x509 -keyout /boot/config/plugins/apache/server.crt -out /boot
 <!--
 The 'plugin' package file.
 -->
-<FILE Name="&plgpath;/&plgname;.txz">
-<URL>&gitURL;/archive/&plgname;.txz</URL>
+<FILE Name="&plgPATH;/&plgNAME;.txz">
+<URL>&gitURL;/archive/&plgNAME;.txz</URL>
 </FILE>
 
 <!--
 The 'plugin' package MD5 hash.
 -->
-<FILE Name="&plgpath;/&plgname;.md5">
-<URL>&gitURL;/archive/&plgname;.md5</URL>
+<FILE Name="&plgPATH;/&plgNAME;.md5">
+<URL>&gitURL;/archive/&plgNAME;.md5</URL>
 </FILE>
 
 <!--
@@ -207,19 +215,19 @@ if [[ $VER == 6.1 ]]; then
 fi
 
 # Verify and install plugin package
-sum1=$(/usr/bin/md5sum &plgpath;/&plgname;.txz)
-sum2=$(/usr/bin/cat &plgpath;/&plgname;.md5)
+sum1=$(/usr/bin/md5sum &plgPATH;/&plgNAME;.txz)
+sum2=$(/usr/bin/cat &plgPATH;/&plgNAME;.md5)
 if [ "${sum1:0:32}" != "${sum2:0:32}" ]; then
   echo "Wrong 'plugin' package md5 hash."
-  rm &plgpath;/&plgname;.txz
-  rm &plgpath;/&plgname;.md5
+  rm &plgPATH;/&plgNAME;.txz
+  rm &plgPATH;/&plgNAME;.md5
   exit 1
 else
-    upgradepkg --install-new &plgpath;/&plgname;.txz
+    upgradepkg --install-new &plgPATH;/&plgNAME;.txz
 
     # Cleaning old source files
-    find &plgpath;/ -type f -iname "&name;*.txz" ! -iname "*&version;*" -delete
-    find &plgpath;/ -type f -iname "&name;*.md5" ! -iname "*&version;*" -delete
+    find &plgPATH;/ -type f -iname "&name;*.txz" ! -iname "*&version;*" -delete
+    find &plgPATH;/ -type f -iname "&name;*.md5" ! -iname "*&version;*" -delete
 
 echo ""
 echo "-----------------------------------------------------------"
@@ -240,10 +248,10 @@ The 'remove' script.
 <FILE Run="/bin/bash" Method="remove">
 <INLINE>
 /etc/rc.d/rc.apache stop
-removepkg &plgpath;/&plgname;.txz
+removepkg &plgPATH;/&plgNAME;.txz
 rm -rf &emhttp;
-rm -f &plgpath;/&plgname;.txz
-rm -f &plgpath;/&plgname;.md5
+rm -f &plgPATH;/&plgNAME;.txz
+rm -f &plgPATH;/&plgNAME;.md5
 
 #remove installed packages
 echo "Please wait, removing installed packages..."
diff --git a/plugins/apache.xml b/plugins/apache.xml
index 9806c24a..0dd037ec 100644
--- a/plugins/apache.xml
+++ b/plugins/apache.xml
@@ -11,8 +11,11 @@ The Apache HTTP Server Project is an effort to develop and maintain an open-sour
 </Description>
 <Support>http://lime-technology.com/forum/index.php?topic=33692.0</Support>
 <Icon>https://raw.githubusercontent.com/dmacias72/unRAID-plugins/master/plugins/apache.png</Icon>
-<Date>2016-09-24</Date>
+<Date>2016-10-15</Date>
 <Changes>
+###2016.10.15
+- add: min and max version to plg
+- update php extensions to 5.6.26 match unRAID 6.3
 ###2016.09.24
 - fix: apr and apr-util packages not installing
 - fix: clearing log files
diff --git a/plugins/libvirtwol.plg b/plugins/libvirtwol.plg
index 5c2464c2..932c216f 100755
--- a/plugins/libvirtwol.plg
+++ b/plugins/libvirtwol.plg
@@ -3,13 +3,13 @@
 <!DOCTYPE PLUGIN [
 <!ENTITY name      "libvirtwol">
 <!ENTITY author    "dmacias72">
-<!ENTITY version   "2016.10.09">
+<!ENTITY version   "2016.10.15">
 <!ENTITY launch    "Settings/VMSettings">
 <!ENTITY gitURL    "https://raw.githubusercontent.com/&author;/unRAID-plugins/master">
 <!ENTITY pluginURL "&gitURL;/plugins/&name;.plg">
 <!ENTITY pkgURL    "&gitURL;/source/packages">
-<!ENTITY plgpath   "/boot/config/plugins/&name;">
-<!ENTITY plgname   "&name;-&version;-x86_64-1">
+<!ENTITY plgPATH   "/boot/config/plugins/&name;">
+<!ENTITY plgNAME   "&name;-&version;-x86_64-1">
 <!ENTITY emhttp    "/usr/local/emhttp/plugins/&name;">
 ]>
 
@@ -20,6 +20,8 @@ This Plugin installs libvirt wake on lan for unRaid 6.1  All dependencies are in
 -->
 
 <CHANGES>
+###2016.10.15
+- add: min and max versions
 ###2016.10.09
 - update for 6.3
 ###2016.09.16
@@ -73,28 +75,27 @@ This Plugin installs libvirt wake on lan for unRaid 6.1  All dependencies are in
 - initial commit
 </CHANGES>
 
-
-<FILE Name="/boot/config/plugins/NerdPack/packages/6.1/python-2.7.9-x86_64-1.txz">
-<URL>&gitURL;/packages/6.1/python-2.7.9-x86_64-1.txz</URL>
-<MD5>7d5f6d12757c59e5f08ca25bd63aab78</MD5>
-</FILE>
-
-<FILE Name="/boot/config/plugins/NerdPack/packages/6.2/python-2.7.12-x86_64-1.txz">
+<FILE Name="&plgPATH;/python-2.7.12-x86_64-1.txz" Min="6.2" Run="upgradepkg --install-new">
 <URL>&gitURL;/packages/6.2/python-2.7.12-x86_64-1.txz</URL>
 <MD5>a94235dba17e63e12eb888cba9bbb155</MD5>
 </FILE>
 
-<FILE Name="&plgpath;/libvirt-python-1.2.18-x86_64-1ponce.txz">
-<URL>&pkgURL;/libvirt-python-1.2.18-x86_64-1ponce.txz</URL>
-<MD5>4198c7784a57d7ff80fb1d53811ceb5e</MD5>
+<FILE Name="&plgPATH;/python-2.7.9-x86_64-1.txz" Max="6.1" Run="upgradepkg --install-new">
+<URL>&gitURL;/packages/6.1/python-2.7.9-x86_64-1.txz</URL>
+<MD5>7d5f6d12757c59e5f08ca25bd63aab78</MD5>
 </FILE>
 
-<FILE Name="&plgpath;/libvirt-python-1.3.1-x86_64-1ponce.txz">
+<FILE Name="&plgPATH;/libvirt-python-1.3.1-x86_64-1ponce.txz" Min="6.2" Run="upgradepkg --install-new">
 <URL>&pkgURL;/libvirt-python-1.3.1-x86_64-1ponce.txz</URL>
 <MD5>9a64e4941dd9c7fa3b9c8bf244c9a2d3</MD5>
 </FILE>
 
-<FILE Name="&plgpath;/pylibpcap-0.6.2-x86_64-1_slack.txz" Run="upgradepkg --install-new">
+<FILE Name="&plgPATH;/libvirt-python-1.2.18-x86_64-1ponce.txz" Max="6.1" Run="upgradepkg --install-new">
+<URL>&pkgURL;/libvirt-python-1.2.18-x86_64-1ponce.txz</URL>
+<MD5>4198c7784a57d7ff80fb1d53811ceb5e</MD5>
+</FILE>
+
+<FILE Name="&plgPATH;/pylibpcap-0.6.2-x86_64-1_slack.txz" Min="6.1" Run="upgradepkg --install-new">
 <URL>&pkgURL;/pylibpcap-0.6.2-x86_64-1_slack.txz</URL>
 <MD5>2531f44126b3c05d76782c9eedba9988</MD5>
 </FILE>
@@ -110,15 +111,15 @@ WOL="disable"
 <!--
 The 'plugin' package file.
 -->
-<FILE Name="&plgpath;/&plgname;.txz">
-<URL>&gitURL;/archive/&plgname;.txz</URL>
+<FILE Name="&plgPATH;/&plgNAME;.txz">
+<URL>&gitURL;/archive/&plgNAME;.txz</URL>
 </FILE>
 
 <!--
 The 'plugin' package MD5 hash.
 -->
-<FILE Name="&plgpath;/&plgname;.md5">
-<URL>&gitURL;/archive/&plgname;.md5</URL>
+<FILE Name="&plgPATH;/&plgNAME;.md5">
+<URL>&gitURL;/archive/&plgNAME;.md5</URL>
 </FILE>
 
 <!--
@@ -136,36 +137,25 @@ if [[ $VER == 6.0 ]]; then
 fi
 
 # Verify and install plugin package
-sum1=$(/usr/bin/md5sum &plgpath;/&plgname;.txz)
-sum2=$(/usr/bin/cat &plgpath;/&plgname;.md5)
+sum1=$(/usr/bin/md5sum &plgPATH;/&plgNAME;.txz)
+sum2=$(/usr/bin/cat &plgPATH;/&plgNAME;.md5)
 if [ "${sum1:0:32}" != "${sum2:0:32}" ]; then
   echo "Wrong 'plugin' package md5 hash."
-  rm &plgpath;/&plgname;.txz
-  rm &plgpath;/&plgname;.md5
+  rm &plgPATH;/&plgNAME;.txz
+  rm &plgPATH;/&plgNAME;.md5
   exit 1
 else
-    if [[ $VER == 6.1 ]]; then
-        echo "\nInstalling dependencies for unRAID 6.1"
-        upgradepkg --install-new /boot/config/plugins/NerdPack/packages/$VER/python-2.7.9-x86_64-1.txz
-        upgradepkg --install-new &plgpath;/libvirt-python-1.2.18-x86_64-1ponce.txz
-    fi
-
     if [[ $VER == 6.2 ]]; then
-        echo "\nInstalling dependencies for unRAID 6.2"
-        upgradepkg --install-new /boot/config/plugins/NerdPack/packages/$VER/python-2.7.12-x86_64-1.txz
-        upgradepkg --install-new &plgpath;/libvirt-python-1.3.1-x86_64-1ponce.txz
-
         # restore VM Manager Menu
         sed -i -- 's/VMManager:1/OtherSettings/g' /usr/local/emhttp/plugins/dynamix.vm.manager/VMSettings.page
     fi
 
     if [[ $VER == 6.3 ]]; then
-        echo "\nInstalling dependencies for unRAID 6.3"
-        upgradepkg --install-new /boot/config/plugins/NerdPack/packages/$VER/python-2.7.12-x86_64-1.txz
-        upgradepkg --install-new &plgpath;/libvirt-python-1.3.1-x86_64-1ponce.txz
+        # restore VM Manager Menu
+        sed -i -- 's/VMManager:1/OtherSettings/g' /usr/local/emhttp/plugins/dynamix.vm.manager/VMSettings.page
     fi
 
-    upgradepkg --install-new &plgpath;/&plgname;.txz
+    upgradepkg --install-new &plgPATH;/&plgNAME;.txz
 
     #restart event daemon
     <![CDATA[
@@ -176,8 +166,8 @@ else
     ]]>
 
     # Cleaning old source files
-    find &plgpath;/ -type f -iname "&name;*.txz" ! -iname "*&version;*" -delete
-    find &plgpath;/ -type f -iname "&name;*.md5" ! -iname "*&version;*" -delete
+    find &plgPATH;/ -type f -iname "&name;*.txz" ! -iname "*&version;*" -delete
+    find &plgPATH;/ -type f -iname "&name;*.md5" ! -iname "*&version;*" -delete
 
 echo ""
 echo "-----------------------------------------------------------"
@@ -198,15 +188,15 @@ The 'remove' script.
 <FILE Run="/bin/bash" Method="remove">
 <INLINE>
 &emhttp;/scripts/stop
-removepkg &plgpath;/&plgname;.txz
+removepkg &plgPATH;/&plgNAME;.txz
 rm -rf &emhttp;
-rm -f &plgpath;/&plgname;.txz
-rm -f &plgpath;/&plgname;.md5
+rm -f &plgPATH;/&plgNAME;.txz
+rm -f &plgPATH;/&plgNAME;.md5
 
 #remove installed packages
-rm -f &plgpath;/libpcap*.txz
-removepkg &plgpath;/*.txz
-rm -f &plgpath;/*.txz
+rm -f &plgPATH;/libpcap*.txz
+removepkg &plgPATH;/*.txz
+rm -f &plgPATH;/*.txz
 
 # restore VM Manager Menu
 #sed -i -- 's/VMManager:1/OtherSettings/g' /usr/local/emhttp/plugins/dynamix.vm.manager/VMSettings.page