Merge branch 'master' into bootstrap

17 files changed, 162 insertions, 0 deletions

diff --git a/tools/templates/core_pkg/base/exclude_files b/tools/templates/core_pkg/base/exclude_files
new file mode 100644
index 0000000..d21c093
--- /dev/null
+++ b/tools/templates/core_pkg/base/exclude_files
@@ -0,0 +1,26 @@
+./boot.config
+./boot/loader.conf
+./boot/loader.conf.local
+./boot/modules/bwi_v3_ucode.ko
+./cf/conf/config.xml
+./cf/conf/enableserial_force
+./cf/conf/trigger_initial_wizard
+./conf.default/config.xml
+./etc/bogons
+./etc/bogonsv6
+./etc/fstab
+./etc/group
+./etc/master.passwd
+./etc/master.passwd.db
+./etc/passwd
+./etc/platform
+./etc/pwd.db
+./etc/rc.conf
+./etc/spwd.db
+./media
+./mnt
+./proc
+./sys
+./tmp
+./usr/local/share/%%PRODUCT_NAME%%/base.mtree
+./usr/local/share/%%PRODUCT_NAME%%/base.txz
diff --git a/tools/templates/core_pkg/base/metadir/+DESC b/tools/templates/core_pkg/base/metadir/+DESC
new file mode 100644
index 0000000..34b9159
--- /dev/null
+++ b/tools/templates/core_pkg/base/metadir/+DESC
@@ -0,0 +1,3 @@
+%%PRODUCT_NAME%% core files
+
+WWW: %%PRODUCT_URL%%
diff --git a/tools/templates/core_pkg/base/metadir/+MANIFEST b/tools/templates/core_pkg/base/metadir/+MANIFEST
new file mode 100644
index 0000000..94b2057
--- /dev/null
+++ b/tools/templates/core_pkg/base/metadir/+MANIFEST
@@ -0,0 +1,15 @@
+name: "%%PRODUCT_NAME%%-base"
+version: "%%VERSION%%"
+origin: "security/%%PRODUCT_NAME%%-base"
+comment: <<EOD
+%%PRODUCT_NAME%% core files
+EOD
+maintainer: development@pfsense.org
+prefix: /usr/local
+deps: {
+
+}
+categories [ security,  ]
+licenselogic: single
+licenses: [ BSD2CLAUSE,  ]
+options: {  }
diff --git a/tools/templates/core_pkg/base/pkg-plist b/tools/templates/core_pkg/base/pkg-plist
new file mode 100644
index 0000000..f531fae
--- /dev/null
+++ b/tools/templates/core_pkg/base/pkg-plist
@@ -0,0 +1,2 @@
+share/%%PRODUCT_NAME%%/base.txz
+share/%%PRODUCT_NAME%%/base.mtree
diff --git a/tools/templates/core_pkg/default-config-serial/metadir/+DESC b/tools/templates/core_pkg/default-config-serial/metadir/+DESC
new file mode 100644
index 0000000..0bde2a1
--- /dev/null
+++ b/tools/templates/core_pkg/default-config-serial/metadir/+DESC
@@ -0,0 +1,3 @@
+%%PRODUCT_NAME%% default config (serial)
+
+WWW: %%PRODUCT_URL%%
diff --git a/tools/templates/core_pkg/default-config-serial/metadir/+INSTALL b/tools/templates/core_pkg/default-config-serial/metadir/+INSTALL
new file mode 100644
index 0000000..11c69cd
--- /dev/null
+++ b/tools/templates/core_pkg/default-config-serial/metadir/+INSTALL
@@ -0,0 +1,15 @@
+#!/bin/sh
+
+if [ "${2}" != "POST-INSTALL" ]; then
+	exit 0
+fi
+
+if [ ! -f /cf/conf/config.xml ]; then
+	cp /conf.default/config.xml /cf/conf/config.xml
+fi
+
+if [ ! -L /conf ]; then
+	ln -sf /cf/conf /conf
+fi
+
+exit 0
diff --git a/tools/templates/core_pkg/default-config-serial/metadir/+MANIFEST b/tools/templates/core_pkg/default-config-serial/metadir/+MANIFEST
new file mode 100644
index 0000000..2931328
--- /dev/null
+++ b/tools/templates/core_pkg/default-config-serial/metadir/+MANIFEST
@@ -0,0 +1,15 @@
+name: "%%PRODUCT_NAME%%-default-config-serial"
+version: "%%VERSION%%"
+origin: "security/%%PRODUCT_NAME%%-default-config-serial"
+comment: <<EOD
+%%PRODUCT_NAME%% default config (serial)
+EOD
+maintainer: development@pfsense.org
+prefix: /
+deps: {
+
+}
+categories [ security,  ]
+licenselogic: single
+licenses: [ BSD2CLAUSE,  ]
+options: {  }
diff --git a/tools/templates/core_pkg/default-config-serial/pkg-plist b/tools/templates/core_pkg/default-config-serial/pkg-plist
new file mode 100644
index 0000000..ddc4f46
--- /dev/null
+++ b/tools/templates/core_pkg/default-config-serial/pkg-plist
@@ -0,0 +1,2 @@
+/conf.default/config.xml
+/cf/conf/enableserial_force
diff --git a/tools/templates/core_pkg/default-config/metadir/+DESC b/tools/templates/core_pkg/default-config/metadir/+DESC
new file mode 100644
index 0000000..692d63e
--- /dev/null
+++ b/tools/templates/core_pkg/default-config/metadir/+DESC
@@ -0,0 +1,3 @@
+%%PRODUCT_NAME%% default config
+
+WWW: %%PRODUCT_URL%%
diff --git a/tools/templates/core_pkg/default-config/metadir/+INSTALL b/tools/templates/core_pkg/default-config/metadir/+INSTALL
new file mode 100644
index 0000000..11c69cd
--- /dev/null
+++ b/tools/templates/core_pkg/default-config/metadir/+INSTALL
@@ -0,0 +1,15 @@
+#!/bin/sh
+
+if [ "${2}" != "POST-INSTALL" ]; then
+	exit 0
+fi
+
+if [ ! -f /cf/conf/config.xml ]; then
+	cp /conf.default/config.xml /cf/conf/config.xml
+fi
+
+if [ ! -L /conf ]; then
+	ln -sf /cf/conf /conf
+fi
+
+exit 0
diff --git a/tools/templates/core_pkg/default-config/metadir/+MANIFEST b/tools/templates/core_pkg/default-config/metadir/+MANIFEST
new file mode 100644
index 0000000..d385eda
--- /dev/null
+++ b/tools/templates/core_pkg/default-config/metadir/+MANIFEST
@@ -0,0 +1,15 @@
+name: "%%PRODUCT_NAME%%-default-config"
+version: "%%VERSION%%"
+origin: "security/%%PRODUCT_NAME%%-default-config"
+comment: <<EOD
+%%PRODUCT_NAME%% default config
+EOD
+maintainer: development@pfsense.org
+prefix: /
+deps: {
+
+}
+categories [ security,  ]
+licenselogic: single
+licenses: [ BSD2CLAUSE,  ]
+options: {  }
diff --git a/tools/templates/core_pkg/default-config/pkg-plist b/tools/templates/core_pkg/default-config/pkg-plist
new file mode 100644
index 0000000..b6fe8df
--- /dev/null
+++ b/tools/templates/core_pkg/default-config/pkg-plist
@@ -0,0 +1 @@
+/conf.default/config.xml
diff --git a/tools/templates/core_pkg/kernel/metadir/+DEINSTALL b/tools/templates/core_pkg/kernel/metadir/+DEINSTALL
new file mode 100644
index 0000000..2ecfa6e
--- /dev/null
+++ b/tools/templates/core_pkg/kernel/metadir/+DEINSTALL
@@ -0,0 +1,19 @@
+#!/bin/sh
+
+if [ "${2}" != "DEINSTALL" ]; then
+	exit 0
+fi
+
+echo "===> Keeping a copy of current kernel in /boot/kernel.old"
+
+# Check if there is a current kernel to be moved
+if [ ! -f /boot/kernel/kernel.gz ]; then
+	echo "ERROR: Current kernel not found"
+	exit 1
+fi
+
+[ -d /boot/kernel.old ] \
+	rm -rf /boot/kernel.old
+
+cp -r /boot/kernel /boot/kernel.old
+exit $?
diff --git a/tools/templates/core_pkg/kernel/metadir/+DESC b/tools/templates/core_pkg/kernel/metadir/+DESC
new file mode 100644
index 0000000..14c9552
--- /dev/null
+++ b/tools/templates/core_pkg/kernel/metadir/+DESC
@@ -0,0 +1,3 @@
+%%PRODUCT_NAME%% kernel
+
+WWW: %%PRODUCT_URL%%
diff --git a/tools/templates/core_pkg/kernel/metadir/+MANIFEST b/tools/templates/core_pkg/kernel/metadir/+MANIFEST
new file mode 100644
index 0000000..1770333
--- /dev/null
+++ b/tools/templates/core_pkg/kernel/metadir/+MANIFEST
@@ -0,0 +1,15 @@
+name: "%%PRODUCT_NAME%%-kernel-%%FLAVOR%%"
+version: "%%VERSION%%"
+origin: "security/%%PRODUCT_NAME%%-kernel"
+comment: <<EOD
+%%PRODUCT_NAME%% kernel
+EOD
+maintainer: development@pfsense.org
+prefix: /
+deps: {
+
+}
+categories [ security,  ]
+licenselogic: single
+licenses: [ BSD2CLAUSE,  ]
+options: {  }
diff --git a/tools/templates/pkg-deinstall.in b/tools/templates/pkg-deinstall.in
new file mode 100644
index 0000000..0ea6111
--- /dev/null
+++ b/tools/templates/pkg-deinstall.in
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+/usr/local/sbin/fcgicli -f /etc/rc.packages -d "pkg=%%PORTNAME%%&when=${2}"
diff --git a/tools/templates/pkg-install.in b/tools/templates/pkg-install.in
new file mode 100644
index 0000000..d9217e6
--- /dev/null
+++ b/tools/templates/pkg-install.in
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+if [ "${2}" != "POST-INSTALL" ]; then
+	exit 0
+fi
+
+/usr/local/sbin/fcgicli -f /etc/rc.packages -d "pkg=%%PORTNAME%%&when=${2}"