openpkg
/
openpkg-packages
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

upgrading package: fourstore 1.0.3 -> 1.0.4

master
Dr. Ralf S. Engelschall 16 years ago
parent
66299caebe
commit
3f9ab086d8
2 changed files with 49 additions and 72 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 117
      fourstore/fourstore.patch
  2. 4
      fourstore/fourstore.spec

117
fourstore/fourstore.patch
Unescape View File

@ -1,6 +1,6 @@
Index: src/backend/Makefile
--- src/backend/Makefile.orig 2010-02-15 14:58:54.000000000 +0100
+++ src/backend/Makefile 2010-03-31 21:24:46.000000000 +0200
--- src/backend/Makefile.orig 2010-09-10 14:03:31.000000000 +0200
+++ src/backend/Makefile 2010-09-11 10:40:44.000000000 +0200
@@ -28,30 +28,50 @@
@diff /tmp/tstest/qbtest.txt exemplar/qbtest.txt && echo "PASS" || echo "FAIL"
@ -57,9 +57,21 @@ Index: src/backend/Makefile
lib4storage.a: $(LIB_OBJS) $(HEADERS)
ar rvu lib4storage.a $(LIB_OBJS)
Index: src/backend/backend.c
--- src/backend/backend.c.orig 2010-09-10 14:03:31.000000000 +0200
+++ src/backend/backend.c 2010-09-11 10:40:44.000000000 +0200
@@ -532,7 +532,7 @@
if (files & FS_OPEN_LEX && !be->res) {
be->res = fs_rhash_open(be, "res", flags);
if (!be->res) {
- fs_error(LOG_ERR, "failed to open resurce file");
+ fs_error(LOG_ERR, "failed to open resource file");
return 1;
}
Index: src/backend/disk-space.c
--- src/backend/disk-space.c.orig 2010-02-15 14:58:54.000000000 +0100
+++ src/backend/disk-space.c 2010-03-31 21:24:46.000000000 +0200
--- src/backend/disk-space.c.orig 2010-09-10 14:03:31.000000000 +0200
+++ src/backend/disk-space.c 2010-09-11 10:40:44.000000000 +0200
@@ -23,7 +23,7 @@
#include <string.h>
#include <errno.h>
@ -70,8 +82,8 @@ Index: src/backend/disk-space.c
#endif
Index: src/backend/mhash.c
--- src/backend/mhash.c.orig 2010-02-15 14:58:54.000000000 +0100
+++ src/backend/mhash.c 2010-03-31 21:24:46.000000000 +0200
--- src/backend/mhash.c.orig 2010-09-10 14:03:31.000000000 +0200
+++ src/backend/mhash.c 2010-09-11 10:40:44.000000000 +0200
@@ -14,7 +14,7 @@
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
@ -82,8 +94,8 @@ Index: src/backend/mhash.c
#endif
#include <stdlib.h>
Index: src/backend/ptree.c
--- src/backend/ptree.c.orig 2010-02-15 14:58:54.000000000 +0100
+++ src/backend/ptree.c 2010-03-31 21:24:46.000000000 +0200
--- src/backend/ptree.c.orig 2010-09-10 14:03:31.000000000 +0200
+++ src/backend/ptree.c 2010-09-11 10:40:44.000000000 +0200
@@ -14,7 +14,7 @@
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
@ -94,8 +106,8 @@ Index: src/backend/ptree.c
#endif
#include <stdlib.h>
Index: src/backend/rhash.c
--- src/backend/rhash.c.orig 2010-02-15 14:58:54.000000000 +0100
+++ src/backend/rhash.c 2010-03-31 21:24:46.000000000 +0200
--- src/backend/rhash.c.orig 2010-09-10 14:03:31.000000000 +0200
+++ src/backend/rhash.c 2010-09-11 10:40:44.000000000 +0200
@@ -15,7 +15,7 @@
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
@ -139,8 +151,8 @@ Index: src/backend/rhash.c
g_free(rh->filename);
free(rh);
Index: src/common/4s-server.c
--- src/common/4s-server.c.orig 2010-02-15 14:58:54.000000000 +0100
+++ src/common/4s-server.c 2010-03-31 21:24:46.000000000 +0200
--- src/common/4s-server.c.orig 2010-09-10 14:03:31.000000000 +0200
+++ src/common/4s-server.c 2010-09-11 10:40:44.000000000 +0200
@@ -36,6 +36,7 @@
#include <syslog.h>
#include <netdb.h>
@ -150,8 +162,8 @@ Index: src/common/4s-server.c
static char *global_kb_name = NULL;
static float global_disk_limit = 0.0f;
Index: src/common/msort.c
--- src/common/msort.c.orig 2010-02-15 14:58:54.000000000 +0100
+++ src/common/msort.c 2010-03-31 21:24:46.000000000 +0200
--- src/common/msort.c.orig 2010-09-10 14:03:31.000000000 +0200
+++ src/common/msort.c 2010-09-11 10:40:44.000000000 +0200
@@ -18,7 +18,6 @@
Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
02111-1307 USA. */
@ -161,8 +173,8 @@ Index: src/common/msort.c
#include <stdlib.h>
#include <string.h>
Index: src/common/qsort.c
--- src/common/qsort.c.orig 2010-02-15 14:58:54.000000000 +0100
+++ src/common/qsort.c 2010-03-31 21:24:46.000000000 +0200
--- src/common/qsort.c.orig 2010-09-10 14:03:31.000000000 +0200
+++ src/common/qsort.c 2010-09-11 10:40:44.000000000 +0200
@@ -21,7 +21,6 @@
Engineering a sort function; Jon Bentley and M. Douglas McIlroy;
Software - Practice and Experience; Vol. 23 (11), 1249-1265, 1993. */
@ -172,25 +184,12 @@ Index: src/common/qsort.c
#include <stdlib.h>
#include <string.h>
Index: src/frontend/Makefile
--- src/frontend/Makefile.orig 2010-02-15 14:58:54.000000000 +0100
+++ src/frontend/Makefile 2010-03-31 21:24:46.000000000 +0200
@@ -35,10 +35,10 @@
@./tests/run.pl
4s-query: 4s-query.o query.o results.o query-data.o query-datatypes.o query-cache.o filter.o filter-datatypes.o order.o optimiser.o decimal.o import.o update.o ../common/lib4store.a ../common/libsort.a
- $(CC) $(LDFLAGS) $(readedit_ldflags) -o 4s-query $^
+ $(CC) -o 4s-query $^ $(LDFLAGS) $(readedit_ldflags)
4s-update: 4s-update.o update.o import.o ../common/lib4store.a
- $(CC) $(LDFLAGS) $(readedit_ldflags) -o 4s-update $^
+ $(CC) -o 4s-update $^ $(LDFLAGS) $(readedit_ldflags)
decimal.o: decimal.h
@@ -53,35 +53,40 @@
--- src/frontend/Makefile.orig 2010-09-10 14:03:31.000000000 +0200
+++ src/frontend/Makefile 2010-09-11 10:42:25.000000000 +0200
@@ -53,19 +53,19 @@
optimiser.o: debug.h
4s-import: 4s-import.o import.o ../common/lib4store.a ../common/libsort.a
4s-import: 4s-import.o import.o ../common/lib4store.a ../libs/stemmer/libstemmer.o ../libs/double-metaphone/double_metaphone.o ../common/libsort.a
- $(CC) $(LDFLAGS) -o 4s-import $^
+ $(CC) -o 4s-import $^ $(LDFLAGS)
@ -200,9 +199,9 @@ Index: src/frontend/Makefile
4s-size: size.o ../common/lib4store.a
- $(CC) $(LDFLAGS) -o 4s-size $^
+ $(CC) -o 4s-size $^ $(LDFLAGS)
+ $(CC) -o 4s-size $^ $(LDFLAGS)
4s-info: 4s-info.o query.o query-datatypes.o query-data.o query-cache.o order.o optimiser.o filter.o filter-datatypes.o results.o decimal.o import.o ../common/lib4store.a ../common/libsort.a
4s-info: 4s-info.o query.o query-datatypes.o query-data.o query-cache.o order.o optimiser.o filter.o filter-datatypes.o results.o decimal.o ../common/lib4store.a ../common/libsort.a
- $(CC) $(LDFLAGS) -o 4s-info $^
+ $(CC) -o 4s-info $^ $(LDFLAGS)
@ -211,13 +210,9 @@ Index: src/frontend/Makefile
+ $(CC) -o 4s-restore $^ $(LDFLAGS)
4s-resolve: 4s-resolve.o ../common/lib4store.a ../common/libsort.a
+ $(CC) -o $@ $^ $(LDFLAGS)
4s-bind: 4s-bind.o ../common/lib4store.a ../common/libsort.a
+ $(CC) -o $@ $^ $(LDFLAGS)
@@ -74,10 +74,10 @@
4s-reverse-bind: 4s-reverse-bind.o ../common/lib4store.a ../common/libsort.a
+ $(CC) -o $@ $^ $(LDFLAGS)
4s-dump: dump.o ../common/lib4store.a ../common/libsort.a
- $(CC) $(LDFLAGS) -o 4s-dump $^
@ -229,16 +224,10 @@ Index: src/frontend/Makefile
filter-test.o: filter-test.c
cc -c -std=gnu99 -Wall $(PROFILE) -g -I../ `pkg-config --cflags rasqal glib-2.0` `pcre-config --cflags` $^
filter-test: filter-test.o filter.o filter-datatypes.o query-data.o decimal.o ../common/lib4store.a ../common/libsort.a
+ $(CC) -o $@ $^ $(LDFLAGS)
decimal-test: decimal-test.o decimal.o
+ $(CC) -o $@ $^ $(LDFLAGS)
Index: src/frontend/results.c
--- src/frontend/results.c.orig 2010-02-15 14:58:54.000000000 +0100
+++ src/frontend/results.c 2010-03-31 21:24:46.000000000 +0200
@@ -382,6 +382,13 @@
--- src/frontend/results.c.orig 2010-09-10 14:03:31.000000000 +0200
+++ src/frontend/results.c 2010-09-11 10:40:44.000000000 +0200
@@ -483,6 +483,13 @@
}
#endif
@ -253,8 +242,8 @@ Index: src/frontend/results.c
return fs_value_error(FS_ERROR_INVALID_TYPE, "bad value in expression");
case RASQAL_EXPR_LITERAL:
Index: src/frontend/size.c
--- src/frontend/size.c.orig 2010-02-15 14:58:54.000000000 +0100
+++ src/frontend/size.c 2010-03-31 21:24:46.000000000 +0200
--- src/frontend/size.c.orig 2010-09-10 14:03:31.000000000 +0200
+++ src/frontend/size.c 2010-09-11 10:40:44.000000000 +0200
@@ -91,8 +91,6 @@
printf("%5s%12lld%+12lld%12lld%12lld\n",
"TOTAL", total.quads_s, (total.quads_sr - total.quads_s),
@ -265,17 +254,17 @@ Index: src/frontend/size.c
}
Index: src/http/Makefile
--- src/http/Makefile.orig 2010-02-15 14:58:54.000000000 +0100
+++ src/http/Makefile 2010-03-31 21:24:46.000000000 +0200
--- src/http/Makefile.orig 2010-09-10 14:03:31.000000000 +0200
+++ src/http/Makefile 2010-09-11 10:42:46.000000000 +0200
@@ -22,4 +22,4 @@
rm -rf *.dSYM
4s-httpd: httpd.o ../common/lib4store.a $(FRONTEND) ../common/libsort.a
- $(CC) $(LDFLAGS) -o $@ $^ `pcre-config --libs`
+ $(CC) -o $@ $^ `pcre-config --libs` $(LDFLAGS)
4s-httpd: httpd.o ../common/lib4store.a $(FRONTEND) ../common/libsort.a ../libs/stemmer/libstemmer.o ../libs/double-metaphone/double_metaphone.o
- $(CC) $(LDFLAGS) -o $@ $^ `pcre-config --libs` ../libs/stemmer/libstemmer.o
+ $(CC) -o $@ $^ `pcre-config --libs` ../libs/stemmer/libstemmer.o $(LDFLAGS)
Index: src/utilities/Makefile
--- src/utilities/Makefile.orig 2010-02-15 14:58:54.000000000 +0100
+++ src/utilities/Makefile 2010-03-31 21:24:46.000000000 +0200
--- src/utilities/Makefile.orig 2010-09-10 14:03:31.000000000 +0200
+++ src/utilities/Makefile 2010-09-11 10:40:44.000000000 +0200
@@ -26,20 +26,20 @@
rm -rf *.dSYM
@ -303,15 +292,3 @@ Index: src/utilities/Makefile
- $(CC) $(LDFLAGS) -o 4s-backend-passwd $^
+ $(CC) -o 4s-backend-passwd $^ $(LDFLAGS)
Index: src/backend/backend.c
--- src/backend/backend.c.orig 2010-02-15 14:58:54.000000000 +0100
+++ src/backend/backend.c 2010-03-31 21:32:00.000000000 +0200
@@ -532,7 +532,7 @@
if (files & FS_OPEN_LEX && !be->res) {
be->res = fs_rhash_open(be, "res", flags);
if (!be->res) {
- fs_error(LOG_ERR, "failed to open resurce file");
+ fs_error(LOG_ERR, "failed to open resource file");
return 1;
}

4
fourstore/fourstore.spec
Unescape View File

@ -31,8 +31,8 @@ Distribution: OpenPKG Community
Class: EVAL
Group: Database
License: GPL
Version: 1.0.3
Release: 20100425
Version: 1.0.4
Release: 20100911
# list of sources
Source0: http://4store.org/download/4store-v%{version}.tar.gz

Write Preview
Loading…
Cancel
Save