FreeBSD Bugzilla – Attachment 172531 Details for
Bug 211098
mail/postsrsd: Should not create / install postsrsd.secret for package
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
create postsrsd.secrete from rc script
postsrsd_20160714.patch (text/plain), 2.05 KB, created by
Miroslav Lachman
on 2016-07-14 19:04:55 UTC
(
hide
)
Description:
create postsrsd.secrete from rc script
Filename:
MIME Type:
Creator:
Miroslav Lachman
Created:
2016-07-14 19:04:55 UTC
Size:
2.05 KB
patch
obsolete
>diff -r -u3 postsrsd.orig/Makefile postsrsd/Makefile >--- postsrsd.orig/Makefile 2016-07-14 20:48:56.708741693 +0200 >+++ postsrsd/Makefile 2016-07-14 21:00:02.764533667 +0200 >@@ -3,7 +3,7 @@ > > PORTNAME= postsrsd > PORTVERSION= 1.3 >-PORTREVISION= 2 >+PORTREVISION= 3 > CATEGORIES= mail > > MAINTAINER= ports@bsdserwis.com >@@ -31,6 +31,6 @@ > > DOCS_CMAKE_ON= -DENABLE_DOCS:STRING="ON" > >-PLIST_FILES= sbin/postsrsd man/man8/postsrsd.8.gz etc/postsrsd.secret >+PLIST_FILES= sbin/postsrsd man/man8/postsrsd.8.gz > > .include <bsd.port.mk> >diff -r -u3 postsrsd.orig/files/patch-postinstall.cmake.in postsrsd/files/patch-postinstall.cmake.in >--- postsrsd.orig/files/patch-postinstall.cmake.in 2016-07-14 20:48:56.710578268 +0200 >+++ postsrsd/files/patch-postinstall.cmake.in 2016-07-14 20:59:24.697535737 +0200 >@@ -1,6 +1,11 @@ >---- postinstall.cmake.in.orig 2015-12-13 08:56:05 UTC >-+++ postinstall.cmake.in >-@@ -7,51 +7,13 @@ set(INIT_FLAVOR "@INIT_FLAVOR@") >+--- postinstall.cmake.in.orig 2015-12-13 09:56:05.000000000 +0100 >++++ postinstall.cmake.in 2016-07-14 20:58:08.347539472 +0200 >+@@ -1,4 +1,3 @@ >+-set(GENERATE_SRS_SECRET "@GENERATE_SRS_SECRET@") >+ set(SYSCONF_DIR "@SYSCONF_DIR@") >+ set(SYSD_UNIT_DIR "@SYSD_UNIT_DIR@") >+ set(CHROOT_DIR "@CHROOT_DIR@") >+@@ -7,51 +6,13 @@ > set(SECRET_FILE "@PROJECT_NAME@.secret") > set(DD "@DD@") > set(BASE64_ENCODE "@BASE64_ENCODE@") >@@ -53,7 +58,7 @@ > message(STATUS "Generating secret key") > execute_process( > COMMAND ${DD} if=/dev/urandom bs=18 count=1 >-@@ -60,7 +22,7 @@ if(GENERATE_SRS_SECRET AND DD AND BASE64 >+@@ -60,7 +21,7 @@ > ERROR_QUIET > OUTPUT_STRIP_TRAILING_WHITESPACE > ) >diff -r -u3 postsrsd.orig/files/postsrsd.in postsrsd/files/postsrsd.in >--- postsrsd.orig/files/postsrsd.in 2016-07-14 20:48:56.709577460 +0200 >+++ postsrsd/files/postsrsd.in 2016-07-14 20:33:14.769217354 +0200 >@@ -84,6 +84,9 @@ > if [ -n "${postsrsd_uid}" ] ; then > chown ${postsrsd_uid} ${_piddir} > fi >+ if [ ! -f "${postsrsd_secret}" ] ; then >+ tr -cd "[:alnum:]" < /dev/urandom | head -c 24 > "${postsrsd_secret}" >+ fi > } > > postsrsd_postcmd()
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 211098
:
172531
|
172549