Attachment 197576 Details for Bug 231789 – patch

[patch] patch

cbsd.patch (text/plain), 4.11 KB, created by Piotr Kubaj on 2018-09-28 16:20:36 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Piotr Kubaj

Created: 2018-09-28 16:20:36 UTC

Size: 4.11 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 480846)
>+++ Makefile	(working copy)
>@@ -10,10 +10,6 @@
> LICENSE=	BSD2CLAUSE
> LICENSE_FILE=	${WRKSRC}/LICENSE
> 
>-BROKEN_mips=		fails to link: cannot find -lc++
>-BROKEN_mips64=		fails to link: cannot find -lc++
>-BROKEN_powerpc64=	fails to link: cannot find -lc++
>-
> RUN_DEPENDS=	rsync:net/rsync \
> 		sudo:security/sudo \
> 		sqlite3:databases/sqlite3 \
>Index: files/patch-Makefile
>===================================================================
>--- files/patch-Makefile	(nonexistent)
>+++ files/patch-Makefile	(working copy)
>@@ -0,0 +1,11 @@
>+--- Makefile.orig	2018-09-28 16:15:34 UTC
>++++ Makefile
>+@@ -76,7 +76,7 @@ cbsd: pkg-config-check
>+ 	#${CC} misc/src/sqlcli.c -static -pthread -lsqlite3 -lm -L/usr/local/lib -I/usr/local/include -o misc/sqlcli && ${STRIP} misc/sqlcli
>+ 	# ICU?
>+ 	#${CC} misc/src/sqlcli.c -static -pthread -lsqlite3 -lpthread -licui18n -licuuc -licudata -lm -L/usr/local/lib -I/usr/local/include -o misc/sqlcli && ${STRIP} misc/sqlcli
>+-	${CC} misc/src/sqlcli.c `pkg-config sqlite3 --cflags --libs` -lm -lc++ -o misc/sqlcli && ${STRIP} misc/sqlcli
>++	${CC} misc/src/sqlcli.c `pkg-config sqlite3 --cflags --libs` -lm -o misc/sqlcli && ${STRIP} misc/sqlcli
>+ 	${CC} misc/src/cbsdlogtail.c -o misc/cbsdlogtail && ${STRIP} misc/cbsdlogtail
>+ 	${CC} misc/src/pwcrypt.c -lcrypt -o misc/pwcrypt && ${STRIP} misc/pwcrypt
>+ 	${CC} misc/src/chk_arp_byip.c -o misc/chk_arp_byip && ${STRIP} misc/chk_arp_byip
>
>Property changes on: files/patch-Makefile
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: files/patch-bin_cbsdsh_Makefile
>===================================================================
>--- files/patch-bin_cbsdsh_Makefile	(nonexistent)
>+++ files/patch-bin_cbsdsh_Makefile	(working copy)
>@@ -0,0 +1,11 @@
>+--- bin/cbsdsh/Makefile.orig	2018-09-28 16:10:13 UTC
>++++ bin/cbsdsh/Makefile
>+@@ -21,7 +21,7 @@ NOMAN=		yes
>+ 
>+ DPADD= ${LIBEDIT} ${LIBTERMCAP}
>+ #LDADD= -ledit -ltermcap -lsqlite3 -lm -pthread -ljail
>+-LDADD= -ledit -ltermcap -lm -pthread -ljail `pkg-config sqlite3 --libs` -lm -lc++
>++LDADD= -ledit -ltermcap -lm -pthread -ljail `pkg-config sqlite3 --libs` -lm
>+ 
>+ #CFLAGS+=-DSHELL -I. -I${.CURDIR} -DCBSD -I/usr/local/include -L/usr/lib -L/usr/local/lib
>+ CFLAGS+=-DSHELL -I. -I${.CURDIR} -DCBSD -I/usr/local/include -L/usr/local/lib
>
>Property changes on: files/patch-bin_cbsdsh_Makefile
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: files/patch-sudoexec_initenv
>===================================================================
>--- files/patch-sudoexec_initenv	(nonexistent)
>+++ files/patch-sudoexec_initenv	(working copy)
>@@ -0,0 +1,11 @@
>+--- sudoexec/initenv.orig	2018-09-28 16:11:43 UTC
>++++ sudoexec/initenv
>+@@ -264,7 +264,7 @@ phase2()
>+ 			echo "pkg-config must be present on the system to build CBSD from the source. Please install it first: pkg install pkgconf";
>+ 			exit 1
>+ 		fi
>+-		${CC_CMD} ${distdir}/misc/src/sqlcli.c $( pkg-config sqlite3 --cflags --libs ) -lm -lc++ -o ${distdir}/misc/sqlcli
>++		${CC_CMD} ${distdir}/misc/src/sqlcli.c $( pkg-config sqlite3 --cflags --libs ) -lm -o ${distdir}/misc/sqlcli
>+ 	fi
>+ 	installne "-s -o ${cbsduser} -g ${cbsduser} -m 500" ${distdir}/misc/sqlcli ${miscdir}/sqlcli
>+ 	[ -f ${distdir}/misc/sqlcli ] && /bin/rm -f ${distdir}/misc/sqlcli
>
>Property changes on: files/patch-sudoexec_initenv
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property

Actions: View | Diff

Attachments on bug 231789: 197576