Attachment #35862 for bug #57754

View | Details | Raw Unified | Return to bug 57754
Collapse All | Expand All

Lines 30-35 Link Here

(-)devel/subversion/Makefile (+65 lines)
30	--with-swig=no	30	--with-swig=no
31		31
32		32
		33	SVNREPOS?= /home/svn/repos
		34
33	MAN1= svn.1 svnadmin.1	35	MAN1= svn.1 svnadmin.1
34	MANCOMPRESSED= no	36	MANCOMPRESSED= no
35		37
Lines 40-48 Link Here
40	CONFIGURE_ARGS+= \	42	CONFIGURE_ARGS+= \
41	--with-apxs=${APXS}	43	--with-apxs=${APXS}
42	PLIST_SUB+= MOD_DAV_SVN=""	44	PLIST_SUB+= MOD_DAV_SVN=""
		45	SVNGROUP?= www
43	.else	46	.else
44	PLIST_SUB+= MOD_DAV_SVN="@comment "	47	PLIST_SUB+= MOD_DAV_SVN="@comment "
45	PKGDEINSTALL= NONEXISTENT	48	PKGDEINSTALL= NONEXISTENT
		49	SVNGROUP?= svn
46	.endif	50	.endif
47		51
48	.if defined(WITH_APACHE2_APR)	52	.if defined(WITH_APACHE2_APR)
Lines 57-62 Link Here
57	--with-apr-util=${LOCALBASE}	61	--with-apr-util=${LOCALBASE}
58	.endif	62	.endif
59		63
		64	.if defined(WITH_SVNSERVE_WRAPPER)
		65	PLIST_SUB+= SVNSERVE_WRAPPER=""
		66	EXTRA_PATCHES= ${PATCHDIR}/build-outputs.mk.patch
		67	.else
		68	PLIST_SUB+= SVNSERVE_WRAPPER="@comment "
		69	.endif
		70
60	pre-extract:	71	pre-extract:
61	.if !defined (BATCH)	72	.if !defined (BATCH)
62	@dialog --title "-- URGENT UPGRADE INFORMATION --" --clear --yesno \	73	@dialog --title "-- URGENT UPGRADE INFORMATION --" --clear --yesno \
Lines 80-85 Link Here
80	@${ECHO_MSG} "by defining WITH_APACHE2_APR."	91	@${ECHO_MSG} "by defining WITH_APACHE2_APR."
81	.endif	92	.endif
82	@${ECHO_MSG}	93	@${ECHO_MSG}
		94	.if defined(WITH_SVNSERVE_WRAPPER)
		95	@${ECHO_MSG} "svnserve wrapper enabled."
		96	.else
		97	@${ECHO_MSG} "You can install the svnserve wrapper (sets umask 002)"
		98	@${ECHO_MSG} "by defining WITH_SVNSERVE_WRAPPER."
		99	.endif
		100	@${ECHO_MSG}
		101	.if defined(WITH_REPOSITORY_CREATION)
		102	@${ECHO_MSG} "I will create (or use, if it exists) \"${SVNGROUP}\" group."
		103	@${ECHO_MSG} "Make sure that all commiters are its members."
		104	.else
		105	@${ECHO_MSG} "You can have the repository created for you by defining"
		106	@${ECHO_MSG} "WITH_REPOSITORY_CREATION."
		107	@${ECHO_MSG} ""
		108	@${ECHO_MSG} "Make sure that:"
		109	@${ECHO_MSG} "* all your svn users are members of a common group"
		110	@${ECHO_MSG} "* this group is the group id of the db/ and locks/"
		111	@${ECHO_MSG} " subdirectories of your repository"
		112	@${ECHO_MSG} "* the above subdirectories are writable by this group"
		113	@${ECHO_MSG} ""
		114	.endif
		115	@${ECHO_MSG}
83		116
84	post-extract:	117	post-extract:
85	@${REINPLACE_CMD} 's/ldb/ldb4/g' ${WRKSRC}/configure	118	@${REINPLACE_CMD} 's/ldb/ldb4/g' ${WRKSRC}/configure
Lines 98-103 Link Here
98	${MKDIR} ${DOCSDIR}	131	${MKDIR} ${DOCSDIR}
99	for f in BUGS CHANGES COMMITTERS COPYING HACKING INSTALL README; do \	132	for f in BUGS CHANGES COMMITTERS COPYING HACKING INSTALL README; do \
100	${INSTALL_DATA} ${WRKSRC}/$$f ${DOCSDIR}; \	133	${INSTALL_DATA} ${WRKSRC}/$$f ${DOCSDIR}; \
		134	done
		135	.endif
		136	.if defined(WITH_SVNSERVE_WRAPPER)
		137	@${INSTALL_SCRIPT} ${FILESDIR}/svnserve.wrapper ${PREFIX}/bin/svnserve
		138	.endif
		139	.if defined(WITH_REPOSITORY_CREATION) && !exists(${SVNREPOS})
		140	. if defined(WITH_SVNSERVE_WRAPPER)
		141	@if /usr/sbin/pw groupshow "${SVNGROUP}" >/dev/null 2>&1; then \
		142	echo "You already have a group \"${SVNGROUP}\", so I will use it."; \
		143	else \
		144	if /usr/sbin/pw groupadd ${SVNGROUP} -h -; \
		145	then \
		146	echo "Added group \"${SVNGROUP}\"."; \
		147	else \
		148	echo "Adding group \"${SVNGROUP}\" failed..."; \
		149	echo "Please create it, and try again."; \
		150	${FALSE}; \
		151	fi; \
		152	fi
		153	. endif
		154	@${MKDIR} ${SVNREPOS}
		155	@${PREFIX}/bin/svnadmin create ${SVNREPOS}
		156	${CHGRP} ${SVNGROUP} ${SVNREPOS}/db ${SVNREPOS}/locks/db.lock
		157	${CHMOD} g+w ${SVNREPOS}/db ${SVNREPOS}/locks/db.lock
		158	for i in ${SVNREPOS}/db/* ; do \
		159	i=$${i##*/}; \
		160	case $$i in \
		161	DB_CONFIG) ;; \
		162	*) ${CHGRP} ${SVNGROUP} ${SVNREPOS}/db/$$i; \
		163	${CHMOD} g+w ${SVNREPOS}/db/$$i; \
		164	;; \
		165	esac; \
101	done	166	done
102	.endif	167	.endif
103		168

Line 0 Link Here

(-)devel/subversion/files/build-outputs.mk.patch (+11 lines)
	1	--- build-outputs.mk.orig Wed Oct 8 16:01:40 2003
	2	+++ build-outputs.mk Wed Oct 8 16:02:00 2003
	3	@@ -447,7 +447,7 @@
	4	cd subversion/svnadmin ; $(INSTALL_FS_BIN) svnadmin$(EXEEXT) $(DESTDIR)$(fs_bindir)/svnadmin$(EXEEXT)
	5	cd subversion/svndumpfilter ; $(INSTALL_FS_BIN) svndumpfilter$(EXEEXT) $(DESTDIR)$(fs_bindir)/svndumpfilter$(EXEEXT)
	6	cd subversion/svnlook ; $(INSTALL_FS_BIN) svnlook$(EXEEXT) $(DESTDIR)$(fs_bindir)/svnlook$(EXEEXT)
	7	- cd subversion/svnserve ; $(INSTALL_FS_BIN) svnserve$(EXEEXT) $(DESTDIR)$(fs_bindir)/svnserve$(EXEEXT)
	8	+ cd subversion/svnserve ; $(INSTALL_FS_BIN) svnserve$(EXEEXT) $(DESTDIR)$(fs_bindir)/svnserve.real$(EXEEXT)
	9
	10	install-fs-lib: subversion/libsvn_fs/libsvn_fs-1.la subversion/libsvn_repos/libsvn_repos-1.la subversion/libsvn_ra_local/libsvn_ra_local-1.la
	11	$(MKDIR) $(DESTDIR)$(fs_libdir)

Line 0 Link Here

(-)devel/subversion/files/svnserve.wrapper (+7 lines)
	1	#!/bin/sh
	2
	3	SVNSERVE=$(dirname $(realpath $0))/svnserve.real
	4
	5	umask 002
	6	$SVNSERVE "$@"
	7

Lines 3-8 Link Here

(-)devel/subversion/pkg-plist (+1 lines)
3	bin/svndumpfilter	3	bin/svndumpfilter
4	bin/svnlook	4	bin/svnlook
5	bin/svnserve	5	bin/svnserve
		6	%%SVNSERVE_WRAPPER%%bin/svnserve.real
6	bin/svnversion	7	bin/svnversion
7	include/subversion-1/mod_dav_svn.h	8	include/subversion-1/mod_dav_svn.h
8	include/subversion-1/svn-revision.txt	9	include/subversion-1/svn-revision.txt

Return to bug 57754