[Evolvis-commits] r311: File Release System needed modifications integrated↵

mirabilos at evolvis.org mirabilos at evolvis.org
Thu Feb 25 14:15:43 CET 2010


Author: mirabilos
Date: 2010-02-25 13:15:41 +0000 (Thu, 25 Feb 2010)
New Revision: 311

Modified:
   trunk/gforge_base/evolvisforge/
   trunk/gforge_base/evolvisforge/gforge/deb-specific/local.inc.template
   trunk/gforge_base/evolvisforge/gforge/deb-specific/sf-httpd.conf.template
   trunk/gforge_base/evolvisforge/gforge/debian/changelog
   trunk/gforge_base/evolvisforge/gforge/debian/rules
   trunk/gforge_base/evolvisforge/gforge/debian/sourceforge.config
   trunk/gforge_base/evolvisforge/gforge/debian/sourceforge.postinst
   trunk/gforge_base/evolvisforge/gforge/debian/sourceforge.templates
   trunk/gforge_base/evolvisforge/gforge/utils/fileforge.c
   trunk/gforge_base/evolvisforge/gforge/www/include/frs.class
   trunk/gforge_base/evolvisforge/gforge/www/project/admin/editpackages.php
   trunk/gforge_base/evolvisforge/gforge/www/project/admin/editreleases.php
   trunk/gforge_base/evolvisforge/gforge/www/project/admin/qrs.php
Log:
File Release System needed modifications integrated



Property changes on: trunk/gforge_base/evolvisforge
___________________________________________________________________
Name: bzr:revision-info
   - timestamp: 2001-09-16 21:48:05.000000000 +0000
committer: cbayle

   + timestamp: 2001-09-16 21:49:23.000000000 +0000
committer: cbayle

Name: bzr:file-ids
   - 
   + gforge/deb-specific/local.inc.template	7 at 9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk%2Fgforge%2Fdeb-specific%2Flocal.inc.template
gforge/deb-specific/sf-httpd.conf.template	7 at 9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk%2Fgforge%2Fdeb-specific%2Fsf-httpd.conf.template
gforge/debian/changelog	7 at 9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk%2Fgforge%2Fdebian%2Fchangelog
gforge/debian/rules	7 at 9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk%2Fgforge%2Fdebian%2Frules
gforge/debian/sourceforge.config	7 at 9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk%2Fgforge%2Fdebian%2Fsourceforge.config
gforge/debian/sourceforge.postinst	7 at 9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk%2Fgforge%2Fdebian%2Fsourceforge.postinst
gforge/debian/sourceforge.templates	7 at 9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk%2Fgforge%2Fdebian%2Fsourceforge.templates
gforge/utils/fileforge.c	2 at 9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk%2Fgforge%2Futils%2Ffileforge.c
gforge/www/include/frs.class	2 at 9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk%2Fgforge%2Fwww%2Finclude%2Ffrs.class
gforge/www/project/admin/editpackages.php	2 at 9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk%2Fgforge%2Fwww%2Fproject%2Fadmin%2Feditpackages.php
gforge/www/project/admin/editreleases.php	2 at 9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk%2Fgforge%2Fwww%2Fproject%2Fadmin%2Feditreleases.php
gforge/www/project/admin/qrs.php	2 at 9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk%2Fgforge%2Fwww%2Fproject%2Fadmin%2Fqrs.php

Name: bzr:revision-id:v4
   - 1 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:1
2 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:2
3 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:7
4 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:9
5 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:10
6 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:11
7 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:12
8 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:13
9 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:14
10 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:15
11 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:16
12 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:17
13 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:18
14 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:19
15 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:20
16 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:21
17 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:22
18 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:23
19 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:24
20 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:25
21 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:26
22 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:27
23 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:28
24 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:29
25 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:30
26 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:31
27 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:32
28 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:33
29 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:34
30 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:35
31 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:36
32 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:37
33 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:38
34 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:39
35 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:40
36 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:41
37 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:42
38 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:43
39 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:44
40 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:45
41 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:46
42 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:47
43 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:48
44 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:49
45 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:50
46 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:51
47 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:52
48 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:53
49 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:54
50 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:55
51 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:56
52 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:57
53 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:58
54 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:59
55 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:60
56 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:61
57 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:62
58 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:63
59 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:64
60 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:65
61 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:66
62 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:67
63 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:68
64 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:69
65 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:70
66 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:71
67 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:72
68 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:73
69 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:74
70 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:75
71 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:76
72 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:77
73 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:78
74 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:79
75 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:80
76 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:81

   + 1 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:1
2 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:2
3 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:7
4 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:9
5 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:10
6 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:11
7 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:12
8 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:13
9 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:14
10 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:15
11 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:16
12 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:17
13 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:18
14 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:19
15 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:20
16 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:21
17 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:22
18 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:23
19 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:24
20 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:25
21 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:26
22 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:27
23 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:28
24 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:29
25 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:30
26 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:31
27 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:32
28 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:33
29 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:34
30 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:35
31 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:36
32 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:37
33 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:38
34 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:39
35 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:40
36 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:41
37 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:42
38 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:43
39 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:44
40 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:45
41 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:46
42 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:47
43 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:48
44 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:49
45 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:50
46 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:51
47 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:52
48 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:53
49 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:54
50 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:55
51 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:56
52 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:57
53 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:58
54 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:59
55 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:60
56 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:61
57 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:62
58 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:63
59 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:64
60 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:65
61 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:66
62 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:67
63 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:68
64 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:69
65 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:70
66 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:71
67 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:72
68 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:73
69 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:74
70 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:75
71 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:76
72 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:77
73 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:78
74 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:79
75 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:80
76 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:81
77 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:82

Name: bzr:text-parents
   - 
   + gforge/deb-specific/local.inc.template	svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:69
gforge/deb-specific/sf-httpd.conf.template	svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:68
gforge/debian/changelog	svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:77
gforge/debian/rules	svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:68
gforge/debian/sourceforge.config	svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:28
gforge/debian/sourceforge.postinst	svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:77
gforge/debian/sourceforge.templates	svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:7
gforge/utils/fileforge.c	svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:79
gforge/www/include/frs.class	svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:2
gforge/www/project/admin/editpackages.php	svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:2
gforge/www/project/admin/editreleases.php	svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:2
gforge/www/project/admin/qrs.php	svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:2


Modified: trunk/gforge_base/evolvisforge/gforge/deb-specific/local.inc.template
===================================================================
--- trunk/gforge_base/evolvisforge/gforge/deb-specific/local.inc.template	2010-02-25 13:15:36 UTC (rev 310)
+++ trunk/gforge_base/evolvisforge/gforge/deb-specific/local.inc.template	2010-02-25 13:15:41 UTC (rev 311)
@@ -35,6 +35,9 @@
 // Machine used for downloading sources/packages
 $sys_download_host = "download.{domain_name}";
  
+// Machine used for downloading sources/packages
+$sys_upload_host = "upload.{domain_name}";
+
 // Machine(s) that host users' shell accounts
 //  N.B. to the SourceForge Crew: What's the difference between the user
 // host and the shell host?  They are clearly two different hostnames
@@ -87,11 +90,12 @@
 // note that password NOT stored here
 $sys_ldap_admin_dn="cn=admin,ou=People,{ldap_base_dn}";
  
+// If you change something here don't forget to update fileforge
 // Where files are placed when uploaded
-$FTPINCOMING_DIR = "/var/lib/sourceforge/ftp/incoming";
+$FTPINCOMING_DIR = "/var/lib/sourceforge/chroot/home/users/<USER>/incoming";
 
 // Where the released files are located
-$FTPFILES_DIR = "/var/lib/sourceforge/download";
+$FTPFILES_DIR = "/var/lib/sourceforge/download/<GROUP>";
  
 // Where the SourceForge files are placed
 // *** IMPORTANT: sys_urlroot *MUST* be an ABSOLUTE FILEYSTEM PATH NAME

Modified: trunk/gforge_base/evolvisforge/gforge/deb-specific/sf-httpd.conf.template
===================================================================
--- trunk/gforge_base/evolvisforge/gforge/deb-specific/sf-httpd.conf.template	2010-02-25 13:15:36 UTC (rev 310)
+++ trunk/gforge_base/evolvisforge/gforge/deb-specific/sf-httpd.conf.template	2010-02-25 13:15:41 UTC (rev 311)
@@ -51,6 +51,11 @@
 </VirtualHost>
 
 <VirtualHost {ip_address}>
+  ServerName {download_host}
+  DocumentRoot /var/lib/sourceforge/download
+</VirtualHost>
+
+<VirtualHost {ip_address}>
   ServerName {lists_host}
   AddHandler cgi-script .cgi
 

Modified: trunk/gforge_base/evolvisforge/gforge/debian/changelog
===================================================================
--- trunk/gforge_base/evolvisforge/gforge/debian/changelog	2010-02-25 13:15:36 UTC (rev 310)
+++ trunk/gforge_base/evolvisforge/gforge/debian/changelog	2010-02-25 13:15:41 UTC (rev 311)
@@ -33,9 +33,11 @@
   * Fixed possible infinite loop in cronjobs/calculate_user_metric.php.
   * [Christian] backport of 2_6_1 docman for better language support
   * [Christian] Fixed install-ldap loss of robot password
-  * [Christian] Started FTP setup 
+  * [Christian] Started FTP setup
+  * [Christian] Download server added
+  * [Christian] File Release FRS support added (closes: #108173)
 
- -- Christian Bayle <bayle at aist.enst.fr>  Sat, 15 Sep 2001 23:41:59 +0200
+ -- Christian Bayle <bayle at aist.enst.fr>  Sun, 16 Sep 2001 22:09:35 +0200
 
 sourceforge (2.5-10) unstable; urgency=low
 

Modified: trunk/gforge_base/evolvisforge/gforge/debian/rules
===================================================================
--- trunk/gforge_base/evolvisforge/gforge/debian/rules	2010-02-25 13:15:36 UTC (rev 310)
+++ trunk/gforge_base/evolvisforge/gforge/debian/rules	2010-02-25 13:15:41 UTC (rev 311)
@@ -17,6 +17,8 @@
 
 build: configure-stamp build-stamp
 	gcc -o  utils/cvssh utils/grap.c
+	gcc -o  utils/fileforge utils/fileforge.c
+	gcc -o  utils/tmpfilemove utils/tmpfilemove.c
 build-stamp:
 	dh_testdir
 
@@ -33,6 +35,8 @@
 	dh_testroot
 	rm -f build-stamp configure-stamp
 	rm -f utils/cvssh
+	rm -f utils/fileforge
+	rm -f utils/tmpfilemove
 	rm -f cvssh.1
 
 	# Add here commands to clean up after the build process.
@@ -111,6 +115,10 @@
 	install -m 755 deb-specific/cvs-pserver $(CURDIR)/debian/sourceforge/usr/lib/sourceforge/bin/
 	install -m 755 utils/cvssh $(CURDIR)/debian/sourceforge/bin/cvssh 
 
+	# FRS stuff
+	install -m 4755 utils/fileforge $(CURDIR)/debian/sourceforge/usr/lib/sourceforge/bin/fileforge 
+	install -m 4755 utils/tmpfilemove $(CURDIR)/debian/sourceforge/usr/lib/sourceforge/bin/tmpfilemove 
+
 	# SSH and CVS in one
 	install -m 755 deb-specific/update-user-group-cvs.sh $(CURDIR)/debian/sourceforge/usr/lib/sourceforge/bin/
 

Modified: trunk/gforge_base/evolvisforge/gforge/debian/sourceforge.config
===================================================================
--- trunk/gforge_base/evolvisforge/gforge/debian/sourceforge.config	2010-02-25 13:15:36 UTC (rev 310)
+++ trunk/gforge_base/evolvisforge/gforge/debian/sourceforge.config	2010-02-25 13:15:41 UTC (rev 311)
@@ -70,6 +70,12 @@
     db_set sourceforge/lists_host lists.$RET
 fi
 
+db_fget sourceforge/download_host seen || true
+if [ "$RET" = "false" ] ; then
+    db_get sourceforge/domain_name
+    db_set sourceforge/download_host download.$RET
+fi
+
 db_get sourceforge/web_only
 if [ "$RET" = "false" ] ; then
     db_fget sourceforge/ldap_host seen || true
@@ -85,6 +91,7 @@
 
     db_input low sourceforge/cvs_host || true
     db_input low sourceforge/lists_host || true
+    db_input low sourceforge/download_host || true
     db_input medium sourceforge/ldap_host || true
     db_input high sourceforge/ldap_base_dn || true
     get_pw sourceforge/ldap_web_add_password high

Modified: trunk/gforge_base/evolvisforge/gforge/debian/sourceforge.postinst
===================================================================
--- trunk/gforge_base/evolvisforge/gforge/debian/sourceforge.postinst	2010-02-25 13:15:36 UTC (rev 310)
+++ trunk/gforge_base/evolvisforge/gforge/debian/sourceforge.postinst	2010-02-25 13:15:41 UTC (rev 311)
@@ -33,7 +33,7 @@
 	
 	# "Fill in the blanks" in config files
         files="local.inc database.inc sf-httpd.conf sf-httpd.secrets local.pl exim.directors"
-        vars="domain_name ip_address server_admin db_password system_name admin_login admin_password cvs_host lists_host newsadmin_groupid ldap_host ldap_base_dn ldap_web_add_password skill_list"
+        vars="domain_name ip_address server_admin db_password system_name admin_login admin_password cvs_host lists_host download_host newsadmin_groupid ldap_host ldap_base_dn ldap_web_add_password skill_list"
         
 	# Invoke our magic script
 	# Parameters are input file, output file, debconf prefix, list of vars

Modified: trunk/gforge_base/evolvisforge/gforge/debian/sourceforge.templates
===================================================================
--- trunk/gforge_base/evolvisforge/gforge/debian/sourceforge.templates	2010-02-25 13:15:36 UTC (rev 310)
+++ trunk/gforge_base/evolvisforge/gforge/debian/sourceforge.templates	2010-02-25 13:15:41 UTC (rev 311)
@@ -25,6 +25,15 @@
  Le nom du serveur qui hébergera vos listes de diffusion de Sourceforge.
  Ce nom ne devrait pas être identique au nom de votre serveur SF principal.
 
+Template: sourceforge/download_host
+Type: string
+Description: Your download server
+ The hostname of the server that will host your Sourceforge packages. 
+ It should not be the same as your main SF host.
+Description-fr: Votre serveur de telechargement
+ Le nom du serveur qui hébergera vos paquetages Sourceforge.
+ Ce nom ne devrait pas être identique au nom de votre serveur SF principal.
+
 Template: sourceforge/ip_address
 Type: string
 Description: Your IP address

Modified: trunk/gforge_base/evolvisforge/gforge/utils/fileforge.c
===================================================================
--- trunk/gforge_base/evolvisforge/gforge/utils/fileforge.c	2010-02-25 13:15:36 UTC (rev 310)
+++ trunk/gforge_base/evolvisforge/gforge/utils/fileforge.c	2010-02-25 13:15:41 UTC (rev 311)
@@ -62,14 +62,14 @@
   } /* if */
   else {
     /* set source */
-    src_file = (char *) malloc(strlen(src_dir_root) + strlen(src_dir_incoming) + strlen(argv[1]) + 1 );
+    src_file = (char *) malloc(strlen(src_dir_root) + strlen(src_dir_incoming) + strlen(argv[1]) +  strlen(argv[2]) + 1 );
     strcpy(src_file, src_dir_root);
     strcat(src_file, argv[2]);
     strcat(src_file, src_dir_incoming);
     strcat(src_file, argv[1]);
 
     /* set destination */
-    dest_file = (char *) malloc(strlen(dest_dir_root) + strlen(dest_dir_download) + strlen(argv[2]) + 1);
+    dest_file = (char *) malloc(strlen(dest_dir_root) + strlen(dest_dir_download) + strlen(argv[3]) + 1);
     strcpy(dest_file, dest_dir_root);
     strcat(dest_file, argv[3]);
     strcat(dest_file, dest_dir_download);

Modified: trunk/gforge_base/evolvisforge/gforge/www/include/frs.class
===================================================================
--- trunk/gforge_base/evolvisforge/gforge/www/include/frs.class	2010-02-25 13:15:36 UTC (rev 310)
+++ trunk/gforge_base/evolvisforge/gforge/www/include/frs.class	2010-02-25 13:15:41 UTC (rev 311)
@@ -82,17 +82,19 @@
 	 * @param $post_date int THe post date
 	 * @returns True on success, False on error
 	 */
-	function frsAddFile($release_time, $filename, $file_size, $post_date, $release_id, $package_id, $type_id, $proc_id)
+	function frsAddFile($release_time, $filename, $group_unix_name, $user_unix_name, $file_size, $post_date, $release_id, $package_id, $type_id, $proc_id)
 	{
 		if( !$this->frsVerifyRelease($release_id, $package_id) ) {
 			$this->setError(' FRS Add File Failed: ' . $this->getErrorMessage());
 			return false;
 		}
 
+		//exec is crunching var
+		$file=$filename;
 		//move the file to a its project page using a setuid program
-		exec ("/usr/local/bin/fileforge $filename ".$group_unix_name, $exec_res);
+		exec ("/usr/lib/sourceforge/bin/fileforge $file $user_unix_name $group_unix_name 2>&1", $exec_res);
 		if ($exec_res[0]) {
-			$this->setError("FRS Add File Failed: $exec_res[0], $exec_res[1]");
+			$this->setError("FRS Add File Failed:<br>$exec_res[0]<br>$exec_res[1]<br>$exec_res[2]");
 			return false;
 		}
 
@@ -719,25 +721,6 @@
 	}
 
 	// }}}
-	// {{{ frsVerifyFileMoved
-
-	/**
-	 * Verify that a file has actually moved from the temp upload location 
-	 * to the projects dir.
-	 *
-	 * @param $file_location String Location of the file in question.
-	 */
-	function frsVerifyFileMoved($file_location)
-	{
-		if( !file_exists($file_location) ) {
-			$this->setError($this->getErrorMessage() . " | Move File Failed ");
-			return false;
-		}
-
-		return true;
-	}
-
-	// }}}
 	// {{{ frsCreatePackage
 
 	/**
@@ -845,36 +828,6 @@
 	}
 
 	// }}}
-	// {{{ frsMoveFile
-
-	/**
-	 * Move a file from the FTP upload dir to a projects dir
-	 *
-	 * @param $file	String The name of the file
-	 * @param $group_unix_name String The name of the group
-	 * @param $now Int The date/time of the move
-	 * @param $FTPINCOMING_DIR The FTP upload dir.  This is probably not needed.
-	 * @param $release_id Int The ID of the release
-	 */
-	function frsMoveFile($file, $group_unix_name, $now, $FTPINCOMING_DIR, $release_id)
-	{
-		clearstatcache();
-		if (is_file("$FTPINCOMING_DIR/$file") && file_exists("$FTPINCOMING_DIR/$file")) {
-			//move the file to a its project page using a setuid program
-			exec ("/usr/local/bin/fileforge $file $group_unix_name", $exec_res);
-			if ($exec_res[0]) {
-				$this->setError("FRS Move File Failed: $exec_res[0],$exec_res[1]");
-				return false;
-			}
-		} else {
-			$this->setError("| FRS Move File Failed: File Name Invalid Or Does Not Exist: $FTPINCOMING_DIR/$file ");
-			return false;
-		}
-
-		return true;
-	}
-
-	//}}}
 	//{{{ frsResolveRelease
 
 	/**

Modified: trunk/gforge_base/evolvisforge/gforge/www/project/admin/editpackages.php
===================================================================
--- trunk/gforge_base/evolvisforge/gforge/www/project/admin/editpackages.php	2010-02-25 13:15:36 UTC (rev 310)
+++ trunk/gforge_base/evolvisforge/gforge/www/project/admin/editpackages.php	2010-02-25 13:15:41 UTC (rev 311)
@@ -60,7 +60,8 @@
 echo '<h3>QRS:</h3>';
 echo 'Click here for to <a href="qrs.php?package_id=' . $package_id . '&group_id=' . $group_id . '">quick-release a file</a>.<br>';
 
-echo '<H3>Packages</H3>
+$user_unix_name=user_getname();
+echo "<H3>Packages</H3>
 <P>
 You can use packages to group different file releases together, or use them however you like. 
 <P>
@@ -73,7 +74,7 @@
 <h4>Your Packages:</H4>
 <P>
 Start by defining your packages, then you can upload files with FTP to the <B>incoming</B> directory on 
-<B>upload.sourceforge.net</B>. Once you have the files uploaded, you can then <B>create releases</B> 
+<B><a href=ftp://$user_unix_name@$sys_upload_host/incoming/>$sys_upload_host</a></B>. Once you have the files uploaded, you can then <B>create releases</B> 
 of your packages.
 <P>
 Once you have have packages defined, you can start creating new <B>releases of packages.</B>
@@ -89,7 +90,7 @@
 <B>3.22.3</B><BR>
 <P>
 You can create new releases of packages by clicking on <B>Add/Edit Releases</B> next to your package name.
-<P>';
+<P>";
 
 /*
 

Modified: trunk/gforge_base/evolvisforge/gforge/www/project/admin/editreleases.php
===================================================================
--- trunk/gforge_base/evolvisforge/gforge/www/project/admin/editreleases.php	2010-02-25 13:15:36 UTC (rev 310)
+++ trunk/gforge_base/evolvisforge/gforge/www/project/admin/editreleases.php	2010-02-25 13:15:41 UTC (rev 311)
@@ -64,15 +64,14 @@
 
 // Add file(s) to the release
 if ($step2) {	
-	// Build a Unix time value from the supplied Y-m-d value
 	$group_unix_name=group_getunixname($group_id);
-	$project_files_dir=$FTPFILES_DIR.$group_unix_name;
+	$user_unix_name=user_getname();
+	$project_files_dir=ereg_replace("<GROUP>",$group_unix_name,$FTPFILES_DIR);
+	$user_incoming_dir=ereg_replace("<USER>",$user_unix_name,$FTPINCOMING_DIR);
 
 	// For every file selected add that file to this release
 	for($x=0;$x<count($file_list);$x++) {
-		$frs->frsMoveFile($file_list[$x], $group_unix_name, time(), $FTPINCOMING_DIR, $release_id);
-		$frs->frsVerifyFileMoved("$project_files_dir/$file_list[$x]");
-		$frs->frsAddFile(time(), $file_list[$x], filesize("$project_files_dir/$file_list[$x]"), time(), $release_id, $package_id);
+		$frs->frsAddFile(time(), $file_list[$x], $group_unix_name, $user_unix_name, filesize("$project_files_dir/$file_list[$x]"), time(), $release_id, $package_id, $type_id, $proc_id);
 		if( !$frs->isError() ) {
 			$feedback .= " File(s) Added ";
 		}
@@ -248,9 +247,9 @@
 <input type="hidden" name="release_id" value="<?php echo $release_id; ?>">
 <input type="hidden" name="step2" value="1">
 
-Next, choose your files from the list below. Choose <b>ONLY YOUR</b> files. If you choose someone else's files, 
-they will not be able to access them and they will be rightfully upset.<br>
-You can upload new files using FTP to <b>upload.sourceforge.net</b> in the <b>incoming</b> directory. 
+<?php $user_unix_name=user_getname(); ?>
+Next, choose your files from the list below.<br>
+You can upload new files using FTP to <b><?php echo "<a href=ftp://$user_unix_name@$sys_upload_host/incoming/>$sys_upload_host</a>"; ?></b> with the username <b><?php echo $user_unix_name ; ?></b> and your password in the <b>incoming</b> directory. 
 When you are done uploading, just hit the refresh button to see the new files.
 <br><br>
 <table border="0" cellpadding="3" cellspacing="3">
@@ -259,7 +258,10 @@
 <?php
 	$atleastone = 0;
 	$counter = 0;
-	$dirhandle = opendir($FTPINCOMING_DIR);
+	$user_incoming_dir=ereg_replace("<USER>",user_getname(),$FTPINCOMING_DIR);
+	//echo "<b>$user_incoming_dir</b>";
+	if(is_dir($user_incoming_dir)){
+	$dirhandle = opendir($user_incoming_dir);
 	
 	// Iterate through each file in the upload dir and display it with a checkbox
 	while ($file = readdir($dirhandle)) {
@@ -277,6 +279,7 @@
 			print("	<input type='checkbox' name='file_list[]' value='$file'>$file<BR>\n");
 		}
 	}
+	}
 
 	// If there aren't any files in the upload dir then say so
 	if($atleastone == 0) {

Modified: trunk/gforge_base/evolvisforge/gforge/www/project/admin/qrs.php
===================================================================
--- trunk/gforge_base/evolvisforge/gforge/www/project/admin/qrs.php	2010-02-25 13:15:36 UTC (rev 310)
+++ trunk/gforge_base/evolvisforge/gforge/www/project/admin/qrs.php	2010-02-25 13:15:41 UTC (rev 311)
@@ -58,7 +58,9 @@
 			Fifth insert it into the database
 		*/
 		$group_unix_name=group_getunixname($group_id);
-		$project_files_dir=$FTPFILES_DIR.$group_unix_name;
+		$project_files_dir=ereg_replace("<GROUP>",$group_unix_name,$FTPFILES_DIR);
+		$user_unix_name=user_getname();
+		$user_incoming_dir=ereg_replace("<USER>",$user_unix_name,$FTPINCOMING_DIR);
 
 		if ($file_name) {
 			// Check to see if the user uploaded a file instead of selecting an existing one.
@@ -69,7 +71,7 @@
 				if (is_file($userfile) && file_exists($userfile)) {
 					$new_userfile = explode("tmp/", $userfile);
 					$userfile = $new_userfile[1];
-					exec ("/usr/local/bin/tmpfilemove $userfile $userfile_name",$exec_res);
+					exec ("/usr/lib/sourceforge/bin/tmpfilemove $userfile $userfile_name $user_unix_name 2>&1",$exec_res);
 					if ($exec_res[0]) {
 						echo '<H3>' . $exec_res[0],$exec_res[1] . '</H3><P>';
 					}
@@ -103,11 +105,11 @@
 							move the file to the project's fileserver directory
 						*/
 						clearstatcache();
-						if (is_file($FTPINCOMING_DIR.'/'.$file_name) && file_exists($FTPINCOMING_DIR.'/'.$file_name)) {
+						if (is_file($user_incoming_dir.'/'.$file_name) && file_exists($user_incoming_dir.'/'.$file_name)) {
 							//move the file to a its project page using a setuid program
-							exec ("/usr/local/bin/fileforge $file_name ".$group_unix_name,$exec_res);
+							exec ("/usr/lib/sourceforge/bin/fileforge $file_name $user_unix_name $group_unix_name 2>&1",$exec_res);
 							if ($exec_res[0]) {
-								echo '<h3>'.$exec_res[0],$exec_res[1].'</H3><P>';
+								echo '<h3>'.$exec_res[0],$exec_res[1],$exec_res[2].'</H3><P>';
 							}
 							//add the file to the database
 							$res=db_query("INSERT INTO frs_file ".
@@ -191,7 +193,11 @@
 		<TD>
 <font color="red"><b>NOTE: In some browsers you must select the file in the file-upload dialog and click "OK".  Double-clicking doesn't register the file.</b></font><br>
 <?php
-	$dirhandle = opendir($FTPINCOMING_DIR);
+	
+	$user_unix_name=user_getname();
+	$user_incoming_dir=ereg_replace("<USER>",$user_unix_name,$FTPINCOMING_DIR);
+	if(is_dir($user_incoming_dir)){
+	$dirhandle = opendir($user_incoming_dir);
 
 	echo '<SELECT NAME="file_name">\n';
 	echo '	<OPTION VALUE="qrs_newfile">Select a file</OPTION>';
@@ -202,6 +208,7 @@
 			print '<OPTION value="'.$file.'">'.$file.'</OPTION>';
 		}
 	}
+	}
 	echo '</SELECT> Or, upload a new file: <input type="file" name="userfile"  size="30">';
 	if (!$atleastone) {
 		print '<h3>No available files</H3>




More information about the evolvis-commits mailing list