Bug 179279 - security/scannedonly: remove support for expired net/samba34
Summary: security/scannedonly: remove support for expired net/samba34
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: Normal Affects Only Me
Assignee: freebsd-ports-bugs (Nobody)
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2013-06-03 23:20 UTC by Rene Ladan
Modified: 2013-06-22 10:40 UTC (History)
0 users

See Also:


Attachments
file.diff (2.30 KB, patch)
2013-06-03 23:20 UTC, Rene Ladan
no flags Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Rene Ladan freebsd_committer freebsd_triage 2013-06-03 23:20:06 UTC
- Remove support for expired net/samba34 by deleting the if ${SAMBA_PORT}==net/samba34 blocks.
- Convert Makefile header.
- Fix typo in pkg-message

Fix: Patch attached with submission follows:
How-To-Repeat: `Tools/scripts/rmport net/samba34` mentions this port.
Comment 1 Edwin Groothuis freebsd_committer freebsd_triage 2013-06-03 23:20:27 UTC
Maintainer of security/scannedonly,

Please note that PR ports/179279 has just been submitted.

If it contains a patch for an upgrade, an enhancement or a bug fix
you agree on, reply to this email stating that you approve the patch
and a committer will take care of it.

The full text of the PR can be found at:
    http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/179279

-- 
Edwin Groothuis via the GNATS Auto Assign Tool
edwin@FreeBSD.org
Comment 2 Edwin Groothuis freebsd_committer freebsd_triage 2013-06-03 23:20:28 UTC
State Changed
From-To: open->feedback

Awaiting maintainers feedback (via the GNATS Auto Assign Tool)
Comment 3 dfilter service freebsd_committer freebsd_triage 2013-06-22 10:36:49 UTC
Author: rene
Date: Sat Jun 22 09:36:41 2013
New Revision: 321559
URL: http://svnweb.freebsd.org/changeset/ports/321559

Log:
  - Remove conditional code for net/samba34, it was removed on 2013-06-04
  - Convert Makefile header
  - Fix typo in pkg-message
  
  PR:		ports/179279
  Submitted by:	myself
  Approved by:	maintainer timeout (girald@etcom.ufrgs.br, 19 days)

Modified:
  head/security/scannedonly/Makefile   (contents, props changed)
  head/security/scannedonly/pkg-message   (contents, props changed)

Modified: head/security/scannedonly/Makefile
==============================================================================
--- head/security/scannedonly/Makefile	Sat Jun 22 09:36:10 2013	(r321558)
+++ head/security/scannedonly/Makefile	Sat Jun 22 09:36:41 2013	(r321559)
@@ -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_VERSION?=	3.6
 
 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' \

Modified: head/security/scannedonly/pkg-message
==============================================================================
--- head/security/scannedonly/pkg-message	Sat Jun 22 09:36:10 2013	(r321558)
+++ head/security/scannedonly/pkg-message	Sat Jun 22 09:36:41 2013	(r321559)
@@ -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:                              *
_______________________________________________
svn-ports-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-ports-all
To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
Comment 4 Rene Ladan freebsd_committer freebsd_triage 2013-06-22 10:38:04 UTC
State Changed
From-To: feedback->closed

Committed, timeout