core packages revision, iptables and added ports collections

5 files changed, 38 insertions, 10 deletions

diff --git a/core/conf/ports/6c37.httpup b/core/conf/ports/6c37.httpup
new file mode 100644
index 0000000..dbc9422
--- /dev/null
+++ b/core/conf/ports/6c37.httpup
@@ -0,0 +1,5 @@
+# Collection 6c37, by kori at openmailbox dot org
+# File generated by the CRUX portdb http://crux.nu/portdb/
+
+ROOT_DIR=/usr/ports/6c37
+URL=https://raw.githubusercontent.com/6c37/crux-ports/3.2/
diff --git a/core/conf/ports/c9-ports.httpup b/core/conf/ports/c9-ports.httpup
new file mode 100644
index 0000000..07ff943
--- /dev/null
+++ b/core/conf/ports/c9-ports.httpup
@@ -0,0 +1,7 @@
+#
+# /etc/ports/c9-ports.httpup: c9-ports port collection
+#
+
+ROOT_DIR=/usr/ports/c9-doc
+URL=https://github.com/s1lvino/c9-ports/raw/master/
+# End of file
diff --git a/core/conf/prt-get.conf b/core/conf/prt-get.conf
index 1ed5143..1a5d841 100644
--- a/core/conf/prt-get.conf
+++ b/core/conf/prt-get.conf
@@ -13,6 +13,9 @@ prtdir /usr/ports/xorg
 # the following line enables the user maintained contrib collection
 prtdir /usr/ports/contrib
 
+# ports described on this documentation
+#prtdir /usr/ports/c9-ports
+
 # 6c37 team provides a collection with freetype-iu, fontconfig-iu
 # and cairo-iu ports.
 #prtdir /usr/ports/6c37
diff --git a/core/package.html b/core/package.html
index fcf583d..2794c51 100644
--- a/core/package.html
+++ b/core/package.html
@@ -95,17 +95,22 @@
         $ prt-get depinst git
         </pre>
 
-        <p>Installing using pkgmk;</p>
+        <p>Installing using pkgmk and pkgadd, first build the package;</p>
 
         <pre>
         $ cd /usr/ports/opt/git
         $ sudo -H -u pkgmk fakeroot pkgmk -d
         </pre>
 
+        <p>Install the package;</p>
+
         <pre>
         $ sudo pkgadd /usr/ports/packages/git#2.9.3-1.pkg.tar.gz
         </pre>
 
+        <p>If you user pkgmk and pkgadd allways check if README, pre and post 
+        instal files exist.</p>
+
         <h3 id="ports">2.2.3. Ports collections</h3>
 
         <p>Clone this documentation;</p>
@@ -114,27 +119,34 @@
         $ git clone https://github.com/s1lvino/c9-doc.git
         </pre>
 
-        <p>Install sysdoc port collection;</p>
+        <p>Install collections later documented;</p>
 
         <pre>
-        $ sudo cp sysdoc/ports/sysdoc.httpup /etc/ports/
+        $ sudo cp c9-doc/core/conf/ports/* /etc/ports/
         </pre>
 
-        <p>Edit /etc/prt-get.conf to activate sysdoc collection;</p>
+        <p>Edit /etc/prt-get.conf to activate new collections;</p>
 
         <pre>
-        prtdir /usr/ports/sysdoc
         # the following line enables the user maintained contrib collection
         prtdir /usr/ports/contrib
+
+        # ports described on this documentation
+        prtdir /usr/ports/c9-ports
+
+        # 6c37 team provides a collection with freetype-iu, fontconfig-iu
+        # and cairo-iu ports.
+        prtdir /usr/ports/6c37
         </pre>
 
-        <p>Get sysdoc ports;</p>
+        <p>Get new ports;</p>
 
         <pre>
-        $ sudo ports -u sysdoc
+        $ sudo ports -u c9-ports
+        $ sudo ports -u 6c37
         </pre>
 
-        <h2 id="info">3.4. Show port information</h2>
+        <h2 id="info">2.2.4. Show port information</h2>
 
         <pre>
         $ prt-get info port_name
@@ -152,13 +164,13 @@
         $ pkginfo -o filename
         </pre>
 
-        <h2 id="depends">3.5. Show port dependencies</h2>
+        <h2 id="depends">2.2.5. Show port dependencies</h2>
 
         <pre>
         $ prt-get depends port_name
         </pre>
 
-        <h2 id="printf">3.6. Print information</h2>
+        <h2 id="printf">2.2.6. Print information</h2>
 
         <p>Example how to get ports installed from contrib. Maybe there is
         a "cleaner" way to this, for now is ok;</p>
diff --git a/core/scripts/iptables.sh b/core/scripts/iptables.sh
index 9fb2872..2931c8c 100644
--- a/core/scripts/iptables.sh
+++ b/core/scripts/iptables.sh
@@ -193,6 +193,7 @@ $IPT -A INPUT -p tcp --tcp-flags ALL ALL -j DROP
 $IPT -A INPUT -p tcp --tcp-flags ALL NONE -m limit --limit 5/m --limit-burst 7 -j LOG --log-level 4 --log-prefix "iptables: drop null: "
 $IPT -A INPUT -p tcp --tcp-flags ALL NONE -j DROP # NULL packets
 
+$IPT -A INPUT -p tcp --tcp-flags SYN,RST SYN,RST -m limit --limit 5/m --limit-burst 7 -j LOG --log-level 4 --log-prefix "iptables: drop syn rst syn rst: "
 $IPT -A INPUT -p tcp --tcp-flags SYN,RST SYN,RST -j DROP
 
 $IPT -A INPUT -p tcp --tcp-flags SYN,FIN SYN,FIN -m limit --limit 5/m --limit-burst 7 -j LOG --log-level 4 --log-prefix "iptables: drop xmas: "