aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Langille <dvl@FreeBSD.org>2020-11-06 16:53:31 +0000
committerDan Langille <dvl@FreeBSD.org>2020-11-06 16:53:31 +0000
commit489a4e63ff76ec8618b86c80776c7de5cec472ea (patch)
tree7a38c66992cf4062a1a657ca61195bea9a8de906
parent3137a744d2f5f28b87b4bc48346c4e866eed69b3 (diff)
downloadports-489a4e63ff76ec8618b86c80776c7de5cec472ea.tar.gz
ports-489a4e63ff76ec8618b86c80776c7de5cec472ea.zip
Update to 0.2.4
re https://github.com/dlangille/SamDrucker/releases/tag/0.2.4 See UPDATING for database schema changes
Notes
Notes: svn path=/head/; revision=554304
-rw-r--r--UPDATING13
-rw-r--r--sysutils/samdruckerclientshell/Makefile3
-rw-r--r--sysutils/samdruckerclientshell/distinfo6
-rw-r--r--www/samdruckerserver/Makefile8
-rw-r--r--www/samdruckerserver/distinfo6
-rw-r--r--www/samdruckerserver/pkg-plist7
6 files changed, 33 insertions, 10 deletions
diff --git a/UPDATING b/UPDATING
index 1cee1f9f3c95..60545d274dd3 100644
--- a/UPDATING
+++ b/UPDATING
@@ -5,6 +5,19 @@ they are unavoidable.
You should get into the habit of checking this file for changes each time
you update your ports collection, before attempting any port upgrades.
+20201106:
+ AFFECTS: users of www/samdruckerserver
+ AUTHOR: dvl@FreeBSD.org
+
+ If upgrading from < 0.2.4, the database schema has changed.
+
+ Run these scripts to update your database:
+
+ * PostgreSQL/updates-2020.08.28.sql
+ * PostgreSQL/procedures.sql
+
+ These scripts are in /usr/local/share/samdrucker/PostgreSQL
+
20201030:
AFFECTS: users of security/openvpn
AUTHOR: mandree@FreeBSD.org
diff --git a/sysutils/samdruckerclientshell/Makefile b/sysutils/samdruckerclientshell/Makefile
index 2cb664d15d61..d8be221d43da 100644
--- a/sysutils/samdruckerclientshell/Makefile
+++ b/sysutils/samdruckerclientshell/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= SamDruckerClientShell
-PORTVERSION= 0.2.1
-PORTREVISION= 1
+PORTVERSION= 0.2.4
CATEGORIES= sysutils
MASTER_SITES= GH
diff --git a/sysutils/samdruckerclientshell/distinfo b/sysutils/samdruckerclientshell/distinfo
index 208b9bdaa1e4..42d94df5d551 100644
--- a/sysutils/samdruckerclientshell/distinfo
+++ b/sysutils/samdruckerclientshell/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1594758123
-SHA256 (dlangille-SamDrucker-0.2.1_GH0.tar.gz) = fc4ae83db5a9deec52cf8bfd709c63c95588178ae38a09f88ce9c6e593727d6a
-SIZE (dlangille-SamDrucker-0.2.1_GH0.tar.gz) = 8069
+TIMESTAMP = 1604679188
+SHA256 (dlangille-SamDrucker-0.2.4_GH0.tar.gz) = 7a378231183dc4bbad91d82c5f7c6a5bd3fe8af21b95261a47acda8800ae8951
+SIZE (dlangille-SamDrucker-0.2.4_GH0.tar.gz) = 8748
diff --git a/www/samdruckerserver/Makefile b/www/samdruckerserver/Makefile
index 9d3f2ffac9dc..14a465c98815 100644
--- a/www/samdruckerserver/Makefile
+++ b/www/samdruckerserver/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= samdrucker
-PORTVERSION= 0.2.3
+PORTVERSION= 0.2.4
CATEGORIES= www
PKGNAMESUFFIX= server
@@ -24,13 +24,17 @@ GH_PROJECT= SamDrucker
SUB_FILES= samdrucker.conf.sample
-PLIST_SUB= ETCDIR="${ETCDIR}"
+PLIST_SUB= ETCDIR="${ETCDIR}" \
+ DATADIR="${DATADIR}"
do-install:
${MKDIR} ${STAGEDIR}${WWWDIR}
${MKDIR} ${STAGEDIR}${ETCDIR}
+ ${MKDIR} ${STAGEDIR}${DATADIR}
${MKDIR} ${STAGEDIR}${PREFIX}/${APACHEETCDIR}/Includes
${INSTALL_SCRIPT} ${WRKSRC}/servers/php/samdrucker.php ${STAGEDIR}${WWWDIR}
${INSTALL_DATA} ${WRKSRC}/servers/php/samdrucker.conf.sample ${STAGEDIR}${ETCDIR}/samdruckerserver.conf.sample
${INSTALL_DATA} ${WRKDIR}/samdrucker.conf.sample ${STAGEDIR}/${PREFIX}/${APACHEETCDIR}/Includes/samdruckerserver.conf.sample
+ (cd ${WRKSRC} && ${COPYTREE_SHARE} PostgreSQL ${STAGEDIR}${DATADIR})
+
.include <bsd.port.mk>
diff --git a/www/samdruckerserver/distinfo b/www/samdruckerserver/distinfo
index 7bec102186f0..dc5a346b467a 100644
--- a/www/samdruckerserver/distinfo
+++ b/www/samdruckerserver/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1594841193
-SHA256 (dlangille-SamDrucker-0.2.3_GH0.tar.gz) = 680b2cd3f1e937a6dbe62a5c468d4b3887b269c5c706dc4068315c656b069bff
-SIZE (dlangille-SamDrucker-0.2.3_GH0.tar.gz) = 8072
+TIMESTAMP = 1604679252
+SHA256 (dlangille-SamDrucker-0.2.4_GH0.tar.gz) = 7a378231183dc4bbad91d82c5f7c6a5bd3fe8af21b95261a47acda8800ae8951
+SIZE (dlangille-SamDrucker-0.2.4_GH0.tar.gz) = 8748
diff --git a/www/samdruckerserver/pkg-plist b/www/samdruckerserver/pkg-plist
index 92c4d929a1e8..8cc75c7780c4 100644
--- a/www/samdruckerserver/pkg-plist
+++ b/www/samdruckerserver/pkg-plist
@@ -1,3 +1,10 @@
@sample(root,www,640) %%ETCDIR%%/samdruckerserver.conf.sample
%%APACHEETCDIR%%/Includes/samdruckerserver.conf.sample
+%%DATADIR%%/PostgreSQL/README.md
+%%DATADIR%%/PostgreSQL/check_%%AP_NAME%%_host_checkins
+%%DATADIR%%/PostgreSQL/database-postgresql-permissions.sql
+%%DATADIR%%/PostgreSQL/database-postgresql.sql
+%%DATADIR%%/PostgreSQL/procedures.sql
+%%DATADIR%%/PostgreSQL/updates-2020.08.28.sql
%%WWWDIR%%/samdrucker.php
+