Date: Mon, 3 Jun 2013 22:12:05 GMT From: Rene Ladan <rene@FreeBSD.org> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/179279: security/scannedonly: remove support for expired net/samba34 Message-ID: <201306032212.r53MC5NN012299@oldred.freebsd.org> Resent-Message-ID: <201306032220.r53MK6f1052833@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 179279
>Category: ports
>Synopsis: security/scannedonly: remove support for expired net/samba34
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Mon Jun 03 22:20:06 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator: Rene Ladan
>Release: FreeBSD 9.1
>Organization:
>Environment:
Ports Tree r319807
>Description:
- Remove support for expired net/samba34 by deleting the if ${SAMBA_PORT}==net/samba34 blocks.
- Convert Makefile header.
- Fix typo in pkg-message
>How-To-Repeat:
`Tools/scripts/rmport net/samba34` mentions this port.
>Fix:
Patch attached with submission follows:
Index: Makefile
===================================================================
--- Makefile (revision 319807)
+++ Makefile (working copy)
@@ -1,9 +1,5 @@
-# New ports collection makefile for: scannedonly
-# Date created: 20 January 2011
-# Whom: girald@etcom.ufrgs.br
-#
+# Created by: girald@etcom.ufrgs.br
# $FreeBSD$
-#
PORTNAME= scannedonly
PORTVERSION= 0.21
@@ -37,40 +33,12 @@
SAMBA_PORT?= net/samba${SAMBA_VERSION:C/([0-9]*)\.([0-9]*).*/\1\2/}
-# If samba34 is installed, we need the sources from samba.
-# We don't if samba3[56] is installed.
-# http://olivier.sessink.nl/scannedonly/faq.html
-.if ${SAMBA_PORT} == net/samba34
-BUILD_DEPENDS+= ${NONEXISTENT}:${PORTSDIR}/${SAMBA_PORT}:configure
-CONFIGURE_ARGS+=\
- --with-samba-source=${WRKDIR}/../../../${SAMBA_PORT}/work/samba-${SAMBA_VERSION}/source3
-USE_AUTOTOOLS= autoconf
-.endif
-
PLIST_FILES= sbin/scannedonlyd_clamav \
bin/scannedonly_prescan
-.if ${SAMBA_PORT} == net/samba34
-PLIST_FILES+= lib/samba/vfs/scannedonly.so
-PLIST_DIRS= lib/samba/vfs \
- lib/samba
-.endif
MAN8= ${PORTNAME}_prescan.8 \
${PORTNAME}d_clamav.8
MANCOMPRESSED= yes
-# Hackery to avoid death for non-obvious reasons if detected
-# SAMBA_VERSION doesn't match the PORTVERSION of samba in ports
-pre-everything::
-.if ${SAMBA_PORT} == net/samba34
- @if [ "$$(${MAKE} -C ${PORTSDIR}/${SAMBA_PORT} -V PORTVERSION)" \
- != "${SAMBA_VERSION}" ] ; \
- then ${ECHO_MSG} -n "==> Bailing. Version of Samba on system is "; \
- ${ECHO_MSG} "${SAMBA_VERSION}, which does not match" ; \
- ${ECHO_MSG} " that in ports. Please update Samba and try again." ; \
- ${FALSE} ; \
- fi
-.endif
-
post-patch:
@${REINPLACE_CMD} \
-e 's|/var/lib/scannedonly/scan|/var/run/scannedonlyd.sock|g' \
Index: pkg-message
===================================================================
--- pkg-message (revision 319807)
+++ pkg-message (working copy)
@@ -1,7 +1,7 @@
**************************************************
* WARNING! *
* *
-* Make sure you've enough socker buffer size. *
+* Make sure you've enough socket buffer size. *
* Consider increasing kern.ipc.maxsockbuf adding *
* at least the following sysctl setting to *
* /etc/sysctl.conf: *
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201306032212.r53MC5NN012299>