SOURCES: lxr-apache.conf (NEW), lxr-conf.patch (NEW), lxr-mysql5.p...
baggins
baggins at pld-linux.org
Wed Feb 22 15:11:25 CET 2006
Author: baggins Date: Wed Feb 22 14:11:25 2006 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- initial revision
---- Files affected:
SOURCES:
lxr-apache.conf (NONE -> 1.1) (NEW), lxr-conf.patch (NONE -> 1.1) (NEW), lxr-mysql5.patch (NONE -> 1.1) (NEW), lxr.htaccess (NONE -> 1.1) (NEW)
---- Diffs:
================================================================
Index: SOURCES/lxr-apache.conf
diff -u /dev/null SOURCES/lxr-apache.conf:1.1
--- /dev/null Wed Feb 22 15:11:25 2006
+++ SOURCES/lxr-apache.conf Wed Feb 22 15:11:20 2006
@@ -0,0 +1,6 @@
+Alias /lxr /usr/share/lxr/
+
+<Directory /usr/share/lxr>
+ AllowOverride All
+ DirectoryIndex source
+</Directory>
================================================================
Index: SOURCES/lxr-conf.patch
diff -u /dev/null SOURCES/lxr-conf.patch:1.1
--- /dev/null Wed Feb 22 15:11:25 2006
+++ SOURCES/lxr-conf.patch Wed Feb 22 15:11:20 2006
@@ -0,0 +1,107 @@
+--- lxr-0.9.4/templates/lxr.conf.orig 2005-04-30 23:30:07.000000000 +0200
++++ lxr-0.9.4/templates/lxr.conf 2006-02-21 17:17:48.000000000 +0100
+@@ -8,11 +8,11 @@
+
+ # Path to glimpse executables.
+ # Define this OR the swish-e variable depending which search engine you want to use.
+- 'glimpsebin' => '/info/lxr/bin/glimpse',
+- 'glimpseindex' => '/info/lxr/bin/glimpseindex',
++ #'glimpsebin' => '/usr/bin/glimpse',
++ #'glimpseindex' => '/usr/bin/glimpseindex',
+
+ # Location of SWISH-E binary
+- 'swishbin' => '/usr/local/bin/swish-e',
++ 'swishbin' => '/usr/bin/swish-e',
+
+ # Path to Exuberant Ctags executable
+ 'ectagsbin' => '/usr/bin/ctags',
+@@ -21,10 +21,10 @@
+ 'tmpdir' => '/tmp',
+
+ # Location of the Generic.pm config file
+- 'genericconf' => '/path/to/lib/LXR/Lang/generic.conf',
++ 'genericconf' => 'PERLVENDOR/LXR/Lang/generic.conf',
+
+ # Location of the ectags.conf file
+- 'ectagsconf' => '/path/to/lib/LXR/Lang/ectags.conf',
++ 'ectagsconf' => 'PERLVENDOR/LXR/Lang/ectags.conf',
+
+ # Paths for CVS module
+ 'cvspath' => '/bin:/usr/local/bin:/usr/bin:/usr/sbin',
+@@ -36,7 +36,7 @@
+ # Configuration for http://192.168.1.3/lxr.
+ # baseurl is used to select configuration block.
+
+- 'baseurl' => 'http://192.168.1.3/lxr', # Put your URL here
++ 'baseurl' => 'http://localhost/lxr', # Put your URL here
+ # baseurl_aliases allows other URLs to be used to reach the site
+ # comment this out if you do not want any aliases
+ 'baseurl_aliases' => [ 'http://localhost/lxr', 'http://mydomain/lxr' ],
+@@ -51,7 +51,7 @@
+ # This can come from a file, a function or be explicitly
+ # ennumerated.
+ # From a file:
+- 'range' => [ readfile('src/versions') ],
++ 'range' => [ qw(linux) ],
+
+ # Explicitly:
+ # 'range' => [qw(v1 v2 v3.1 v4 experimental)],
+@@ -64,13 +64,14 @@
+ # }, # deferred function call.
+
+ # The default version to display
+- 'default' => '1.0.6'
++ 'default' => 'linux'
+ },
+
+ # Define typed variable "a". First value is default.
+ 'a' => {
+ 'name' => 'Architecture',
+- 'range' => [qw(i386 alpha arm m68k mips ppc sparc sparc64)]
++ 'range' => [qw(alpha arm arm26 cris frv h8300 i386 ia64 m32r m68k m68knommu mips parisc powerpc ppc s390 sh sh64 sparc sparc64 um v850 x86_64 xtensa)],
++ 'default' => 'i386'
+ },
+ },
+
+@@ -101,7 +101,7 @@
+ # indexed-src/version2/...
+ # The names of the version directories must match the values for the Version
+ # variable above.
+- 'sourceroot' => '/home/malcolm/indexed-src',
++ 'sourceroot' => '/usr/src/',
+
+ # Alternatively, this can specify a CVS repository by setting the value to "cvs:"
+ # followed by the path to the repository. Note this must be file accessible - remote
+@@ -109,7 +110,7 @@
+ # 'sourceroot' => 'cvs:/hom/karsk/a/CVSROOT/linux',
+
+ # The name to display for this source tree
+- 'sourcerootname' => 'Example',
++ 'sourcerootname' => 'linux',
+
+ # The DBI identifier for the database to use
+ # For mysql, the format is dbi:mysql:dbname=<name>
+@@ -119,8 +119,8 @@
+
+ # If you need to specify the username or password for the database connection,
+ # uncomment the following two lines
+- # 'dbpass' => 'foo',
+- # 'dbuser' => 'lxr',
++ 'dbpass' => 'lxr',
++ 'dbuser' => 'lxr',
+
+ # If you need multiple lxr configurations in one database, set different table
+ # prefixes for them.
+@@ -127,10 +127,10 @@
+ # 'dbprefix' => 'lxr_',
+
+ # For using glimpse, the directory to store the .glimpse files in is required
+- 'glimpsedir' => '/path/to/glimpse/databases',
++ 'glimpsedir' => '/var/lib/lxr/glimpse',
+
+ # Location of swish-e index database files if using swish-e
+- 'swishdir' => '/a/directory/here/',
++ 'swishdir' => '/var/lib/lxr/swish',
+
+ # where to look for include files inside the sourcetree. This is used to hyperlink
+ # to included files.
================================================================
Index: SOURCES/lxr-mysql5.patch
diff -u /dev/null SOURCES/lxr-mysql5.patch:1.1
--- /dev/null Wed Feb 22 15:11:25 2006
+++ SOURCES/lxr-mysql5.patch Wed Feb 22 15:11:20 2006
@@ -0,0 +1,76 @@
+diff -ur lxr-0.9.4/initdb-mysql lxr-0.9.4-mysql5/initdb-mysql
+--- lxr-0.9.4/initdb-mysql 2004-07-20 17:31:24.000000000 +0200
++++ lxr-0.9.4-mysql5/initdb-mysql 2006-02-21 19:20:33.000000000 +0100
+@@ -34,8 +34,8 @@
+
+ create table lxr_releases
+ (fileid int not null references lxr_files,
+- release char(255) binary not null,
+- primary key (fileid,release)
++ `release` char(255) binary not null,
++ primary key (fileid,`release`)
+ );
+
+ create table lxr_useage
+diff -ur lxr-0.9.4/lib/LXR/Index/Mysql.pm lxr-0.9.4-mysql5/lib/LXR/Index/Mysql.pm
+--- lxr-0.9.4/lib/LXR/Index/Mysql.pm 2004-10-18 22:45:37.000000000 +0200
++++ lxr-0.9.4-mysql5/lib/LXR/Index/Mysql.pm 2006-02-21 19:20:13.000000000 +0100
+@@ -71,16 +71,16 @@
+ . "where s.symid = i.symid and i.fileid = f.fileid "
+ . "and f.fileid = r.fileid "
+ . "and i.langid = d.langid and i.type = d.declid "
+- . "and s.symname = ? and r.release = ?");
++ . "and s.symname = ? and r.`release` = ?");
+ $self->{indexes_insert} =
+ $self->{dbh}->prepare(
+ "insert into ${prefix}indexes (symid, fileid, line, langid, type, relsym) values (?, ?, ?, ?, ?, ?)"
+ );
+
+ $self->{releases_select} =
+- $self->{dbh}->prepare("select * from ${prefix}releases where fileid = ? and release = ?");
++ $self->{dbh}->prepare("select * from ${prefix}releases where fileid = ? and `release` = ?");
+ $self->{releases_insert} =
+- $self->{dbh}->prepare("insert into ${prefix}releases (fileid, release) values (?, ?)");
++ $self->{dbh}->prepare("insert into ${prefix}releases (fileid, `release`) values (?, ?)");
+
+ $self->{status_get} =
+ $self->{dbh}->prepare("select status from ${prefix}status where fileid = ?");
+@@ -102,7 +102,7 @@
+ . "where s.symid = u.symid "
+ . "and f.fileid = u.fileid "
+ . "and u.fileid = r.fileid "
+- . "and s.symname = ? and r.release = ? "
++ . "and s.symname = ? and r.`release` = ? "
+ . "order by f.filename");
+ $self->{decl_select} =
+ $self->{dbh}->prepare(
+@@ -115,24 +115,24 @@
+ $self->{dbh}->prepare("delete from ${prefix}indexes "
+ . "using ${prefix}indexes i, ${prefix}releases r "
+ . "where i.fileid = r.fileid "
+- . "and r.release = ?");
++ . "and r.`release` = ?");
+ $self->{delete_useage} =
+ $self->{dbh}->prepare("delete from ${prefix}useage "
+ . "using ${prefix}useage u, ${prefix}releases r "
+ . "where u.fileid = r.fileid "
+- . "and r.release = ?");
++ . "and r.`release` = ?");
+ $self->{delete_status} =
+ $self->{dbh}->prepare("delete from ${prefix}status "
+ . "using ${prefix}status s, ${prefix}releases r "
+ . "where s.fileid = r.fileid "
+- . "and r.release = ?");
++ . "and r.`release` = ?");
+ $self->{delete_releases} =
+- $self->{dbh}->prepare("delete from ${prefix}releases " . "where release = ?");
++ $self->{dbh}->prepare("delete from ${prefix}releases " . "where `release` = ?");
+ $self->{delete_files} =
+ $self->{dbh}->prepare("delete from ${prefix}files "
+ . "using ${prefix}files f, ${prefix}releases r "
+ . "where f.fileid = r.fileid "
+- . "and r.release = ?");
++ . "and r.`release` = ?");
+
+ return $self;
+ }
================================================================
Index: SOURCES/lxr.htaccess
diff -u /dev/null SOURCES/lxr.htaccess:1.1
--- /dev/null Wed Feb 22 15:11:25 2006
+++ SOURCES/lxr.htaccess Wed Feb 22 15:11:20 2006
@@ -0,0 +1,23 @@
+Options Indexes ExecCGI FollowSymlinks
+
+order deny,allow
+
+<Files ~ (.*\.conf|.*\.pm|fixhashbang|genjavaclasses|genxref)$>
+ deny from all
+</Files>
+
+<IfModule mod_perl.c>
+ <Files ~ (find|search|source|ident|diff)$>
+ SetHandler perl-script
+ PerlHandler Apache::Registry
+ ForceType text/html
+ PerlSendHeader On
+ </Files>
+</IfModule>
+
+<IfModule !mod_perl.c>
+ <Files ~ (find|search|source|ident|diff)$>
+ SetHandler cgi-script
+ ForceType text/html
+ </Files>
+</IfModule>
================================================================
More information about the pld-cvs-commit
mailing list