Bug 161981 - [maintainer update] sysutils/samesame to v1.10
Summary: [maintainer update] sysutils/samesame to v1.10
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: 2011-10-24 22:10 UTC by Alex de Kruijff
Modified: 2012-06-18 01:00 UTC (History)
0 users

See Also:


Attachments
port.diff (866 bytes, patch)
2011-10-24 22:10 UTC, Alex de Kruijff
no flags Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Alex de Kruijff 2011-10-24 22:10:01 UTC

    
Comment 1 Pawel Pekala freebsd_committer freebsd_triage 2011-10-25 15:12:02 UTC
Responsible Changed
From-To: freebsd-ports-bugs->pawel

I'll take it.
Comment 2 Pawel Pekala freebsd_committer freebsd_triage 2011-10-25 17:00:20 UTC
State Changed
From-To: open->feedback

There's something wrong with disfile, please see: 
http://people.freebsd.org/~pawel/buildlogs/7/samesame-1.10.log
Comment 3 Pawel Pekala freebsd_committer freebsd_triage 2012-02-11 13:07:01 UTC
Responsible Changed
From-To: pawel->freebsd-ports-bugs

No submitter response, back to the pool
Comment 4 akruijff 2012-02-19 23:28:35 UTC
The e-mail adress I specified is wrong. The correct distinfo is:

MD5 (samesame-1.10.tar.bz2) = f6dec0724a88d1667c80fa44beefca6e
SHA256 (samesame-1.10.tar.bz2) =
9793649925d70a2b9a44aeed4e8f475cfb544296371ddd7c37f8000d14e44d0a
SIZE (samesame-1.10.tar.bz2) = 121316
Comment 5 Michael Scheidell freebsd_committer freebsd_triage 2012-02-20 12:08:25 UTC
Responsible Changed
From-To: freebsd-ports-bugs->scheidell

I'll take it.
Comment 6 Michael Scheidell freebsd_committer freebsd_triage 2012-02-20 12:20:10 UTC
The rc script needs to be rewritten to conform with new format:

Please review 
http://www.freebsd.org/doc/en_US.ISO8859-1/books/porters-handbook/rc-scripts.html

and submit a new rc script.

-- 
Michael Scheidell, CTO
 >*| * SECNAP Network Security Corporation
d: +1.561.948.2259
w: http://people.freebsd.org/~scheidell
Comment 7 Michael Scheidell freebsd_committer freebsd_triage 2012-03-05 15:40:29 UTC
Responsible Changed
From-To: scheidell->freebsd-ports-bugs

Back to pool.
Comment 8 Michael Scheidell freebsd_committer freebsd_triage 2012-03-05 15:40:48 UTC
State Changed
From-To: feedback->open

Feedback Timeout.
Comment 9 akruijff 2012-03-18 23:09:01 UTC
The RC script is installed conditionally, depending on the options the
user chose. It cleans up directories in /tmp/ so it must run before
cleantmp or it will result in an error on the screen. If it is run after
login, then this might cause unexpected behavior, so its run before
login.

--- samesame.diff2 begins here ---
diff -ru -ru port.org/Makefile port/Makefile
--- port.org/Makefile   Sun Mar 18 23:08:56 2012
+++ port/Makefile       Sun Mar 18 23:51:20 2012
@@ -25,6 +25,9 @@
                bin/samearchive-lite    bin/sameln      bin/samemv \
                bin/samechflags         bin/samerm      bin/samechmod \
                bin/samechown           bin/samedelay
+.if defined(WITH_DISK_STORAGE)
+USE_RC_SUBR=   samesame_clean
+.endif
 
 HAS_CONFIGURE= yes
 CONFIGURE_ARGS=        --enable-samechflags --enable-samechmod \
@@ -47,7 +50,6 @@
 
 .if defined(WITH_DISK_STORAGE)
 CONFIGURE_ARGS+=       --enable-disk-storage
-PLIST_FILES+=          etc/rc.d/samesame.sh
 .endif
 
 .if defined(WITH_EXPERIMENTAL)
@@ -87,9 +89,6 @@
 .if defined(WITH_EXPERIMENTAL)
        ${STRIP_CMD} ${PREFIX}/bin/fsort
 .endif
-.endif
-.if defined(WITH_DISK_STORAGE)
-       ${INSTALL_SCRIPT} ${FILESDIR}/samesame.sh ${PREFIX}/etc/rc.d/
 .endif
        @${ECHO}
        @${CAT} pkg-message
Only in port.org/files: samesame.sh
Only in port/files: samesame_clean.in
--- samesame.diff2 ends here ---

--- samesame_clean.in begins here ---
# This is a shell archive.  Save it in a file, remove anything before
# this line, and then unpack it by entering "sh file".  Note, it may
# create directories; files and directories will be owned by you and
# have default permissions.
#
# This archive contains:
#
#       port/files/samesame_clean.in
#
echo x - port/files/samesame_clean.in
sed 's/^X//' >port/files/samesame_clean.in <<
'END-of-port/files/samesame_clean.in'
X#!/bin/sh
X#
X# $FreeBSD$
X#
X
X# PROVIDE: samesame_clean
X# REQUIRE: DAEMON
X# BEFORE:  LOGIN cleantmp
X# KEYWORD: shutdown
X#
X
Xname=samesame_clean
Xstart_cmd="${name}_start"
X
Xsamesame_clean_start() {
X       rm -rf /tmp/samefile /tmp/samearchive
X       ;;
X}
X
Xload_rc_config $name
Xrun_rc_command "$1"
X
END-of-port/files/samesame_clean.in
exit
--- samesame_clean.in ends here ---
Comment 10 Michael Scheidell freebsd_committer freebsd_triage 2012-04-10 13:27:02 UTC
Could you try re-submitting your patch? it seems to not have been taken 
by GNATS as an attachment.

it needs to be a valid MIME attachment if you submitted this by email.


-- 
Michael Scheidell, CTO
 >*| * SECNAP Network Security Corporation
d: +1.561.948.2259
w: http://people.freebsd.org/~scheidell
Comment 11 Alex de Kruijff 2012-04-29 12:08:50 UTC
>Submitter-Id:	current-users
>Originator:	Alex de Kruijff
>Organization:	
>Confidential:	no 
>Synopsis:	Re: ports/161981: [maintainer update] sysutils/samesame to v1.10
>Severity:	non-critical
>Priority:	low
>Category:	ports
>Class:		maintainer-update
>Release:	FreeBSD 6.1-RELEASE-p20 i386
>Environment:
System: FreeBSD Zeus 6.1-RELEASE-p20 FreeBSD 6.1-RELEASE-p20 #0: Wed Nov 14 02:07:49 CET 2007 akruijff@Server1.lan:/temp/obj/temp/src/sys/SERVER-SMP i386


	
>Description:
	
>How-To-Repeat:
	
>Fix:

	

--- samesame.diff2 begins here ---
diff -ru -ru port.org/Makefile port/Makefile
--- port.org/Makefile	Sun Mar 18 23:08:56 2012
+++ port/Makefile	Sun Mar 18 23:51:20 2012
@@ -25,6 +25,9 @@
 		bin/samearchive-lite	bin/sameln 	bin/samemv \
 		bin/samechflags		bin/samerm	bin/samechmod \
 		bin/samechown		bin/samedelay
+.if defined(WITH_DISK_STORAGE)
+USE_RC_SUBR=	samesame_clean
+.endif
 
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-samechflags --enable-samechmod \
@@ -47,7 +50,6 @@
 
 .if defined(WITH_DISK_STORAGE)
 CONFIGURE_ARGS+=	--enable-disk-storage
-PLIST_FILES+=		etc/rc.d/samesame.sh
 .endif
 
 .if defined(WITH_EXPERIMENTAL)
@@ -87,9 +89,6 @@
 .if defined(WITH_EXPERIMENTAL)
 	${STRIP_CMD} ${PREFIX}/bin/fsort
 .endif
-.endif
-.if defined(WITH_DISK_STORAGE)
-	${INSTALL_SCRIPT} ${FILESDIR}/samesame.sh ${PREFIX}/etc/rc.d/
 .endif
 	@${ECHO}
 	@${CAT} pkg-message
diff -ru -ru port.org/distinfo port/distinfo
--- port.org/distinfo	Sun Mar 18 23:08:56 2012
+++ port/distinfo	Sun Mar 18 23:53:13 2012
@@ -1,3 +1,4 @@
 MD5 (samesame-1.10.tar.bz2) = f6dec0724a88d1667c80fa44beefca6e
-SHA256 (samesame-1.10.tar.bz2) = 9793649925d70a2b9a44aeed4e8f475cfb544296371ddd7c37f8000d14e44d0a
+SHA256 (samesame-1.10.tar.bz2) =
+9793649925d70a2b9a44aeed4e8f475cfb544296371ddd7c37f8000d14e44d0a
 SIZE (samesame-1.10.tar.bz2) = 121316
Only in port.org/files: samesame.sh
Only in port/files: samesame_clean.in
Only in port: work
--- samesame.diff2 ends here ---

--- samesame_clean.in begins here ---
#!/bin/sh
#
# $FreeBSD$
#

# PROVIDE: samesame_clean
# REQUIRE: DAEMON
# BEFORE:  LOGIN cleanvar
# KEYWORD: shutdown
#

name=samesame_clean
start_cmd="${name}_start"

samesame_clean_start() {
	rm -rf /tmp/samefile /tmp/samearchive
	;;
}

load_rc_config $name
run_rc_command "$1"
--- samesame_clean.in ends here ---
Comment 12 Michael Scheidell freebsd_committer freebsd_triage 2012-04-30 09:33:45 UTC
Please revisit pr AFTER you try to attach a mime compliant attachment.

if you can't click on a link and fully download the patch, then you 
didn't do it right, or your mail client clobbered it, or the dog ate 
your homework.
(see first 'Fix' and see how the patch stands out?)


-- 
Michael Scheidell, CTO
 >*| * SECNAP Network Security Corporation
d: +1.561.948.2259
w: http://people.freebsd.org/~scheidell
Comment 13 Sylvio Cesar Teixeira freebsd_committer freebsd_triage 2012-06-18 01:00:26 UTC
State Changed
From-To: open->closed

Committed, with minor changes. Thanks!