Date: Sun, 12 Jun 2011 22:11:24 GMT From: "Mikhail T." <m.tsatsenko@gmail.com> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/157803: [PATCH] update net-im/imspector and take mainteinership Message-ID: <201106122211.p5CMBOIf065436@red.freebsd.org> Resent-Message-ID: <201106122220.p5CMK9UB051265@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 157803 >Category: ports >Synopsis: [PATCH] update net-im/imspector and take mainteinership >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Sun Jun 12 22:20:09 UTC 2011 >Closed-Date: >Last-Modified: >Originator: Mikhail T. >Release: 8.2 >Organization: >Environment: FreeBSD red 8.2-RELEASE FreeBSD 8.2-RELEASE #1 r218780: Thu Mar 10 21:36:01 MSK 2011 root@red:/usr/obj/usr/src/sys/XGATE amd64 >Description: - Update port to 0.9 - Add LICENCE - Claim mainteinership - Update COMMENT to fit in 70 chars (in order to make portlint happy) >How-To-Repeat: >Fix: Index: Makefile =================================================================== RCS file: /home/ncvs/ports/net-im/imspector/Makefile,v retrieving revision 1.4 diff -u -r1.4 Makefile --- Makefile 10 Jun 2011 13:23:22 -0000 1.4 +++ Makefile 12 Jun 2011 22:07:04 -0000 @@ -6,14 +6,17 @@ # PORTNAME= imspector -PORTVERSION= 0.5 +PORTVERSION= 0.9 CATEGORIES= net-im MASTER_SITES= http://www.imspector.org/downloads/ -MAINTAINER= ports@FreeBSD.org -COMMENT= IM transparent proxy with monitoring, blocking, and content-filtering supports +MAINTAINER= m.tsatsenko@gmail.com +COMMENT= IM transparent proxy with monitoring, blocking and content-filtering -CFLAGS+= -fPIC +LICENCE= GPLv2 +CFLAGS+= -fPIC -I ${PREFIX}/include -DHAVE_SSL +USE_GMAKE= YES +USE_ICONV= YES CONFIG_FILES= imspector.conf badwords.txt acl.txt @@ -25,11 +28,5 @@ @${REINPLACE_CMD} -e 's,%%PREFIX%%,${PREFIX},g' \ ${WRKSRC}/imspector.conf \ ${WRKSRC}/main.cpp -post-install: -.for f in ${CONFIG_FILES} - @if [ ! -f ${ETCDIR}/${f} ]; then \ - ${CP} -p ${ETCDIR}/${f}.sample ${ETCDIR}/${f} ; \ - fi -.endfor .include <bsd.port.mk> Index: distinfo =================================================================== RCS file: /home/ncvs/ports/net-im/imspector/distinfo,v retrieving revision 1.2 diff -u -r1.2 distinfo --- distinfo 20 Mar 2011 12:53:26 -0000 1.2 +++ distinfo 12 Jun 2011 22:07:04 -0000 @@ -1,2 +1,2 @@ -SHA256 (imspector-0.5.tar.gz) = e40c1e2dfda2602442d2d17306b2a6e39a526d5a17a9c1174858acb639ec1552 -SIZE (imspector-0.5.tar.gz) = 39865 +SHA256 (imspector-0.9.tar.gz) = f864110caa72d0fd16dc49d593374669e61279d0e83fb381f455b8cef31ca57b +SIZE (imspector-0.9.tar.gz) = 66087 Index: pkg-plist =================================================================== RCS file: /home/ncvs/ports/net-im/imspector/pkg-plist,v retrieving revision 1.1 diff -u -r1.1 pkg-plist --- pkg-plist 19 Mar 2008 04:27:40 -0000 1.1 +++ pkg-plist 12 Jun 2011 22:07:04 -0000 @@ -1,15 +1,10 @@ -@unexec if cmp -s %D/%%ETCDIR%%/acl.txt.sample %D/%%ETCDIR%%/acl.txt; then rm -f %D/%%ETCDIR%%/acl.txt; fi -%%ETCDIR%%/acl.txt.sample -@exec if [ ! -f %D/%%ETCDIR%%/acl.txt ] ; then cp -p %D/%F %B/acl.txt; fi -@unexec if cmp -s %D/%%ETCDIR%%/badwords.txt.sample %D/%%ETCDIR%%/badwords.txt; then rm -f %D/%%ETCDIR%%/badwords.txt; fi -%%ETCDIR%%/badwords.txt.sample -@exec if [ ! -f %D/%%ETCDIR%%/badwords.txt ] ; then cp -p %D/%F %B/badwords.txt; fi -@unexec if cmp -s %D/%%ETCDIR%%/imspector.conf.sample %D/%%ETCDIR%%/imspector.conf; then rm -f %D/%%ETCDIR%%/imspector.conf; fi -%%ETCDIR%%/imspector.conf.sample -@exec if [ ! -f %D/%%ETCDIR%%/imspector.conf ] ; then cp -p %D/%F %B/imspector.conf; fi lib/imspector/aclfilterplugin.so lib/imspector/badwordsfilterplugin.so +lib/imspector/catsloggingplugin.so +lib/imspector/censordfilterplugin.so lib/imspector/debugloggingplugin.so +lib/imspector/httpsprotocolplugin.so +lib/imspector/jabberprotocolplugin.so lib/imspector/fileloggingplugin.so lib/imspector/ggprotocolplugin.so lib/imspector/icqprotocolplugin.so cvs diff: Diffing files Index: files/patch-Makefile =================================================================== RCS file: /home/ncvs/ports/net-im/imspector/files/patch-Makefile,v retrieving revision 1.1 diff -u -r1.1 patch-Makefile --- files/patch-Makefile 19 Mar 2008 04:27:40 -0000 1.1 +++ files/patch-Makefile 12 Jun 2011 22:07:04 -0000 @@ -1,32 +1,52 @@ ---- Makefile.orig 2008-03-14 00:55:41.000000000 +0800 -+++ Makefile 2008-03-17 21:14:55.000000000 +0800 -@@ -1,19 +1,19 @@ +--- Makefile.orig 2008-12-22 15:03:15.000000000 +0300 ++++ Makefile 2011-06-11 01:11:31.924759767 +0400 +@@ -1,5 +1,5 @@ -DESTDIR = / -PREFIX = /usr +DESTDIR ?= / +PREFIX ?= /usr ########## + # Comment this out if you dont want SSL +@@ -7,11 +7,11 @@ + + ########## + # Location of openssl installation +-SSL_DIR = /usr ++SSL_DIR ?= /usr + + ########## # If using FreeBSD or OpenBSD COMMENT the below lines -LIBS = -ldl +#LIBS = -ldl # For any distro - #ADD_PLUGINS = mysqlloggingplugin.so sqliteloggingplugin.so postgresqlloggingplugin.so dbfilterplugin.so - ########## + #ADD_PLUGINS = mysqlloggingplugin.so sqliteloggingplugin.so postgresqlloggingplugin.so dbfilterplugin.so dbresponderplugin.so +@@ -23,11 +23,11 @@ + SSL_OBJS = sslstate.o + endif -CXX = g++ +CXX ?= g++ --CXXFLAGS = -Wall -O2 -fPIC -+CXXFLAGS ?= -Wall -O2 -fPIC +-CXXFLAGS = -Wall -O2 -fPIC $(SSL_FLAGS) ++CXXFLAGS ?= -Wall -O2 -fPIC $(SSL_FLAGS) -PLUGIN_FLAGS = $(LIBS) -fPIC -shared -Wl,-soname,$@ -o $@ +PLUGIN_FLAGS ?= $(LIBS) -fPIC -shared -Wl,-soname,$@ -o $@ - IMSPECTOR_OBJS = main.o protocolplugin.o loggingplugin.o filterplugin.o + IMSPECTOR_OBJS = main.o protocolplugin.o loggingplugin.o filterplugin.o responderplugin.o $(SSL_OBJS) -@@ -117,15 +117,15 @@ +@@ -106,7 +106,7 @@ + responderplugin.o: responderplugin.cpp + $(CXX) $(CXXFLAGS) responderplugin.cpp -c + sslstate.o: sslstate.cpp +- $(CXX) $(CXXFLAGS) sslstate.cpp -c ++ $(CXX) $(CXXFLAGS) sslstate.cpp -c -DHAVE_SSL + + options.o: options.cpp + $(CXX) $(CXXFLAGS) options.cpp -c +@@ -162,15 +162,15 @@ install: imspector libimspector.so $(PLUGINS) -mkdir -p $(DESTDIR)/$(PREFIX)/sbin -mkdir -p $(DESTDIR)/$(PREFIX)/lib/imspector @@ -34,18 +54,17 @@ - -install libimspector.so $(DESTDIR)/$(PREFIX)/lib/libimspector.so + -${BSD_INSTALL_PROGRAM} imspector $(DESTDIR)/$(PREFIX)/sbin/imspector + -${BSD_INSTALL_PROGRAM} libimspector.so $(DESTDIR)/$(PREFIX)/lib/libimspector.so - -(for PLUGIN in $(PLUGINS); do \ + -(for PLUGIN in $(PLUGINS) $(ADD_PLUGINS); do \ - install $$PLUGIN $(DESTDIR)/$(PREFIX)/lib/imspector/$$PLUGIN; \ + ${BSD_INSTALL_PROGRAM} $$PLUGIN $(DESTDIR)/$(PREFIX)/lib/imspector/$$PLUGIN; \ done); -- -mkdir -p $(DESTDIR)/$(PREFIX)/etc/imspector + -mkdir -p $(DESTDIR)/$(PREFIX)/etc/imspector - -install imspector.conf $(DESTDIR)/$(PREFIX)/etc/imspector/imspector.conf - -install badwords.txt $(DESTDIR)/$(PREFIX)/etc/imspector/badwords.txt - -install acl.txt $(DESTDIR)/$(PREFIX)/etc/imspector/acl.txt -+ -mkdir -p $(DESTDIR)/${ETCDIR} -+ -${BSD_INSTALL_DATA} imspector.conf $(DESTDIR)/${ETCDIR}/imspector.conf.sample -+ -${BSD_INSTALL_DATA} badwords.txt $(DESTDIR)/${ETCDIR}/badwords.txt.sample -+ -${BSD_INSTALL_DATA} acl.txt $(DESTDIR)/${ETCDIR}/acl.txt.sample ++ -${BSD_INSTALL_DATA} imspector.conf $(DESTDIR)/$(PREFIX)/etc/imspector/imspector.conf ++ -${BSD_INSTALL_DATA} badwords.txt $(DESTDIR)/$(PREFIX)/etc/imspector/badwords.txt ++ -${BSD_INSTALL_DATA} acl.txt $(DESTDIR)/$(PREFIX)/etc/imspector/acl.txt -mkdir -p /var/log/imspector + -mkdir -p /var/lib/imspector - uninstall: Index: files/patch-icqprotocolplugin.cpp =================================================================== RCS file: files/patch-icqprotocolplugin.cpp diff -N files/patch-icqprotocolplugin.cpp --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/patch-icqprotocolplugin.cpp 12 Jun 2011 22:07:04 -0000 @@ -0,0 +1,11 @@ +--- icqprotocolplugin.cpp.orig 2011-06-10 23:51:17.870320723 +0400 ++++ icqprotocolplugin.cpp 2011-06-10 23:54:37.586036961 +0400 +@@ -673,7 +673,7 @@ + size_t inbytesleft = mylength - 4; + size_t outbytesleft = BUFFER_SIZE - 1; /* Trailing \0 */ + size_t result = iconv(iconv_utf16be_utf8, +- &inbuf, &inbytesleft, &outbuf, &outbytesleft); ++ (const char**) &inbuf, &inbytesleft, &outbuf, &outbytesleft); + + if (result == (size_t) -1) + { Index: files/patch-imspector.conf =================================================================== RCS file: /home/ncvs/ports/net-im/imspector/files/patch-imspector.conf,v retrieving revision 1.1 diff -u -r1.1 patch-imspector.conf --- files/patch-imspector.conf 19 Mar 2008 04:27:40 -0000 1.1 +++ files/patch-imspector.conf 12 Jun 2011 22:07:04 -0000 @@ -1,7 +1,7 @@ ---- imspector.conf Thu Mar 13 20:55:41 2008 -+++ imspector.conf Mon Mar 17 15:07:27 2008 -@@ -2,7 +2,7 @@ - #port=16667 +--- imspector.conf.orig 2008-09-04 17:48:13.000000000 +0400 ++++ imspector.conf 2011-06-10 23:41:46.273771152 +0400 +@@ -4,7 +4,7 @@ + #http_port=18080 # This is the default location of protocol and logging plugins. -#plugin_dir=/usr/lib/imspector @@ -9,12 +9,43 @@ # For dropping privs - you probably want to do this. #user=imspector -@@ -19,7 +19,7 @@ - gg_protocol=on +@@ -12,19 +12,19 @@ + + # SSL support? + #ssl=on +-#ssl_key=/usr/etc/imspector/serverkey.pem ++#ssl_key=%%PREFIX%%/etc/imspector/serverkey.pem + + # Fixed cert? +-#ssl_cert=/usr/etc/imspector/servercert.pem ++#ssl_cert=%%PREFIX%%/etc/imspector/servercert.pem + + # Or certs created on-the-fly and signed against a CA +-#ssl_ca_key=/usr/etc/imspector/cakey.pem +-#ssl_ca_cert=/usr/etc/imspector/cacert.pem ++#ssl_ca_key=%%PREFIX%%/etc/imspector/cakey.pem ++#ssl_ca_cert=%%PREFIX%%/etc/imspector/cacert.pem + # And finally a directory to store the created certs + #ssl_cert_dir=/var/lib/imspector + + # Directory of CA certs for IM server cert validation +-#ssl_verify_dir=/usr/lib/ssl/certs ++#ssl_verify_dir=%%PREFIX%%/lib/ssl/certs + # Drop connection when the IM server has a bad cert + #ssl_verify=block + +@@ -70,12 +70,12 @@ + #sqlite_file=/path/to/file # Bad words filtering --#badwords_filename=/etc/imspector/badwords.txt +-#badwords_filename=/usr/etc/imspector/badwords.txt +#badwords_filename=%%PREFIX%%/etc/imspector/badwords.txt #badwords_replace_character=* #badwords_block_count=1 + # ACL +-#acl_filename=/usr/etc/imspector/acl.txt ++#acl_filename=%%PREFIX%%/etc/imspector/acl.txt + + # SQLite-backed filter + #db_filter_filename=/path/to/file >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201106122211.p5CMBOIf065436>