View | Details | Raw Unified | Return to bug 211098 | Differences between
and this patch

Collapse All | Expand All

(-)postsrsd/Makefile (-2 / +2 lines)
Lines 3-9 Link Here
3 

          3
          

        

        

          4
          
PORTNAME=	postsrsd

          4
          
PORTNAME=	postsrsd

        

        

          5
          
PORTVERSION=	1.3

          5
          
PORTVERSION=	1.3

        

          
            

              6
              
PORTREVISION=	2


              6
              
PORTREVISION=	3

            

        

          7
          
CATEGORIES=	mail

          7
          
CATEGORIES=	mail

        

        

          8
          

          8
          

        

        

          9
          
MAINTAINER=	ports@bsdserwis.com

          9
          
MAINTAINER=	ports@bsdserwis.com

        

  

    
      
            Lines 31-36
          
      
      
        Link Here
      
    
  

        

          31
          

          31
          

        

        

          32
          
DOCS_CMAKE_ON=	-DENABLE_DOCS:STRING="ON"

          32
          
DOCS_CMAKE_ON=	-DENABLE_DOCS:STRING="ON"

        

        

          33
          

          33
          

        

          
            

              34
              
PLIST_FILES=	sbin/postsrsd man/man8/postsrsd.8.gz etc/postsrsd.secret


              34
              
PLIST_FILES=	sbin/postsrsd man/man8/postsrsd.8.gz

            

        

          35
          

          35
          

        

        

          36
          
.include <bsd.port.mk>

          36
          
.include <bsd.port.mk>

        



(-)postsrsd/files/patch-postinstall.cmake.in
      (-4 / +9 lines)




  

    
      
            Lines 1-6
          
      
      
        Link Here
      
    
  

          
            

              1
              
--- postinstall.cmake.in.orig	2015-12-13 08:56:05 UTC


              1
              
--- postinstall.cmake.in.orig	2015-12-13 09:56:05.000000000 +0100

            

            

              2
              
+++ postinstall.cmake.in


              2
              
+++ postinstall.cmake.in	2016-07-14 20:58:08.347539472 +0200

            

            

              3
              
@@ -7,51 +7,13 @@ set(INIT_FLAVOR "@INIT_FLAVOR@")


              3
              
@@ -1,4 +1,3 @@

            

            

              
              

              4
              
-set(GENERATE_SRS_SECRET "@GENERATE_SRS_SECRET@")

            

            


              5
              
 set(SYSCONF_DIR "@SYSCONF_DIR@")

            

            


              6
              
 set(SYSD_UNIT_DIR "@SYSD_UNIT_DIR@")

            

            


              7
              
 set(CHROOT_DIR "@CHROOT_DIR@")

            

            


              8
              
@@ -7,51 +6,13 @@

            

        

          4
          
 set(SECRET_FILE "@PROJECT_NAME@.secret")

          9
          
 set(SECRET_FILE "@PROJECT_NAME@.secret")

        

        

          5
          
 set(DD "@DD@")

          10
          
 set(DD "@DD@")

        

        

          6
          
 set(BASE64_ENCODE "@BASE64_ENCODE@")

          11
          
 set(BASE64_ENCODE "@BASE64_ENCODE@")

        

  

    
      
            Lines 53-59
          
      
      
        Link Here
      
    
  

        

          53
          
 	message(STATUS "Generating secret key")

          58
          
 	message(STATUS "Generating secret key")

        

        

          54
          
 	execute_process(

          59
          
 	execute_process(

        

        

          55
          
 		COMMAND ${DD} if=/dev/urandom bs=18 count=1

          60
          
 		COMMAND ${DD} if=/dev/urandom bs=18 count=1

        

          
            

              56
              
@@ -60,7 +22,7 @@ if(GENERATE_SRS_SECRET AND DD AND BASE64


              61
              
@@ -60,7 +21,7 @@

            

        

          57
          
 		ERROR_QUIET

          62
          
 		ERROR_QUIET

        

        

          58
          
 		OUTPUT_STRIP_TRAILING_WHITESPACE

          63
          
 		OUTPUT_STRIP_TRAILING_WHITESPACE

        

        

          59
          
 	)

          64
          
 	)

        



(-)postsrsd/files/postsrsd.in
      (+3 lines)




  

    
      
            Lines 84-89
          
      
      
        Link Here
      
    
  

        

          84
          
    if [ -n "${postsrsd_uid}" ] ; then

          84
          
    if [ -n "${postsrsd_uid}" ] ; then

        

        

          85
          
	chown ${postsrsd_uid} ${_piddir}

          85
          
	chown ${postsrsd_uid} ${_piddir}

        

        

          86
          
    fi

          86
          
    fi

        

            

              
              
              87
              
    if [ ! -f "${postsrsd_secret}" ] ; then

            

            

              88
              
	tr -cd "[:alnum:]" < /dev/urandom | head -c 24 > "${postsrsd_secret}"

            

            

              89
              
    fi

            

        

          87
          
}

          90
          
}

        

        

          88
          

          91
          

        

        

          89
          
postsrsd_postcmd()

          92
          
postsrsd_postcmd()

        






  

  Return to bug 211098