rbgarga

diff --git a/pfPorts/filterlog/files/print-tcp.c b/pfPorts/filterlog/files/print-tcp.c
index 720080c..03f4118 100644
--- a/pfPorts/filterlog/files/print-tcp.c
+++ b/pfPorts/filterlog/files/print-tcp.c
@@ -139,8 +139,8 @@ tcp_print(struct sbuf *sbuf, register const u_char *bp, register u_int length,
                 ip6 = NULL;
 #endif /*INET6*/
         ch = '\0';
-        sport = ntohs(EXTRACT_16BITS(&tp->th_sport));
-        dport = ntohs(EXTRACT_16BITS(&tp->th_dport));

rbgarga

diff --git a/pfPorts/filterlog/files/print-tcp.c b/pfPorts/filterlog/files/print-tcp.c
index e4e5d51..b1056a5 100644
--- a/pfPorts/filterlog/files/print-tcp.c
+++ b/pfPorts/filterlog/files/print-tcp.c
@@ -166,16 +166,21 @@ tcp_print(struct sbuf *sbuf, register const u_char *bp, register u_int length,
                         sbuf_printf(sbuf, "%u:%u,", seq, seq + length);
 		else
 			sbuf_printf(sbuf, "%u,", seq);
-        }
+        } else

rbgarga

diff --git a/pfPorts/filterlog/files/print-ip.c b/pfPorts/filterlog/files/print-ip.c
index b0f8570..646fcf5 100644
--- a/pfPorts/filterlog/files/print-ip.c
+++ b/pfPorts/filterlog/files/print-ip.c
@@ -321,8 +321,8 @@ ip_print(struct sbuf *sbuf,
 		ipds->cp = (const u_char *)ipds->ip + hlen;
 		ipds->nh = ipds->ip->ip_p;
 
-		if (ipds->nh != IPPROTO_TCP && ipds->nh != IPPROTO_UDP &&
-		    ipds->nh != IPPROTO_SCTP && ipds->nh != IPPROTO_DCCP) {

rbgarga

Version                 : 1.2.4_1
PACKAGESITE             : 
PKG_DBDIR               : /var/db/pkg
PKG_CACHEDIR            : /var/cache/pkg
PORTSDIR                : /usr/ports
PUBKEY                  : 
HANDLE_RC_SCRIPTS       : no
ASSUME_ALWAYS_YES       : no
REPOS_DIR               : [
  /etc/pkg/,

rbgarga

DBG(1)> pkg initialized
DBG(1)> PkgConfig: loading repositories in /etc/pkg/
DBG(1)> PKgConfig: loading /etc/pkg/FreeBSD.conf
DBG(1)> PkgConfig: parsing key 'FreeBSD'
DBG(1)> PkgConfig: parsing repository object FreeBSD
Updating repository catalogue
DBG(1)> PkgRepo: verifying update for repo-FreeBSD
DBG(4)> Pkgdb: running 'SELECT count(name) FROM sqlite_master WHERE type='table' AND name='repodata';'
DBG(1)> Pkgrepo, begin incremental update of '/var/db/pkg/repo-FreeBSD.sqlite'
DBG(4)> Pkgdb: executing 'PRAGMA synchronous=off'

rbgarga

diff --git a/pkg_config.8.xml b/pkg_config.8.xml
index 829ef30..9b5930d 100644
--- a/pkg_config.8.xml
+++ b/pkg_config.8.xml
@@ -175,7 +175,7 @@
 				(Legacy version)]]></descr>
 		<website>http://haproxy.1wt.eu/</website>
 		<category>Services</category>
-		<version>1.4.23 pkg v 1.1</version>
+		<version>1.4.24 pkg v 1.1</version>

rbgarga

# set_version.sh generated defaults
export PFSENSE_VERSION=2.2-ALPHA
export FREEBSD_VERSION=10
export FREEBSD_BRANCH=RELENG_10_0
export PFSENSETAG=HEAD
export PFSPATCHFILE=/home/pfsense/tools/builder_scripts/../builder_scripts/conf/patchlist/patches.RELENG_10_0
export PFSPATCHDIR=/home/pfsense/tools/builder_scripts/../patches/RELENG_10_0
export SUPFILE=/home/pfsense/tools/builder_scripts/../builder_scripts/conf/csup/RELENG_8_3-supfile
export CUSTOM_COPY_LIST=/home/pfsense/tools/builder_scripts/../builder_scripts/conf/copylist/copy.list.RELENG_2_2
# Comment out the following line if you would like to automatically select an update server.

rbgarga

Index: Makefile
===================================================================
--- Makefile	(revision 340825)
+++ Makefile	(working copy)
@@ -111,6 +111,7 @@
 
 .if (${ARCH} == "amd64")
 ARCH=		x86_64
+CFLAGS+=	-fPIC
 .endif

rbgarga

| #include <net/pf/pfvar.h>
configure:25138: result: no
configure:25138: checking for net/pfvar.h
configure:25138: c++ -c -O2 -pipe -fno-strict-aliasing -Wno-unused-private-field -std=c++0x -I/usr/local/include  -I/usr/include  -I/usr/include  conftest.cpp >&5
In file included from conftest.cpp:247:
In file included from /usr/include/netinet/ip_compat.h:169:
/usr/include/net/if_var.h:130:16: error: use of undeclared identifier 'IFNAMSIZ'
        char    if_xname[IFNAMSIZ];     /* external name (name + unit) */
                         ^
/usr/include/net/if_var.h:156:17: error: field has incomplete type 'struct if_data'

rbgarga

diff --git a/usr/local/www/pkg_mgr_install.php b/usr/local/www/pkg_mgr_install.php
index 289505c..1e61e0c 100755
--- a/usr/local/www/pkg_mgr_install.php
+++ b/usr/local/www/pkg_mgr_install.php
@@ -114,7 +114,7 @@ Rounded("div#mainareapkg","bl br","#FFF","#eeeeee","smooth");
 
 ob_flush();
 
-$pkgname = str_replace(array("<", ">", ";", "&", "'"), "", htmlspecialchars_decode($_GET['pkg']));
+$pkgname = str_replace(array("<", ">", ";", "&", "'", '"'), "", htmlspecialchars_decode($_GET['pkg'], ENT_QUOTES | ENT_HTML401));