Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Julien ROZO (f96a942225bbcbe6cd0558200b72b057f3129a2f)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] GIT changes to master grimoire by Julien ROZO (f96a942225bbcbe6cd0558200b72b057f3129a2f)

Chronological Thread  
    < Chronological >       < Thread >
  • From: Julien ROZO <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Julien ROZO (f96a942225bbcbe6cd0558200b72b057f3129a2f)
  • Date: Tue, 2 Mar 2010 16:41:26 -0600
GIT changes to master grimoire by Julien ROZO <julien AT rozo.org>:

audio-creation/flite/DETAILS | 6
audio-creation/flite/HISTORY | 4
audio-creation/flite/PRE_BUILD | 3
audio-creation/flite/flite-1.3-sharedlibs.patch | 170
------------------------
http/modsecurity/DETAILS | 2
http/modsecurity/HISTORY | 8 -
http/modsecurity/modsecurity.gpg |binary
7 files changed, 15 insertions(+), 178 deletions(-)

New commits:
commit 4e44d51cc0b44134431372c738663795a7f65de0
Author: Julien ROZO <julien AT rozo.org>
Commit: Julien ROZO <julien AT rozo.org>

modsecurity: updated version to 2.5.12
updated public key for Brian Rectanus in modsecurity.gpg keyring since
the old one has expired
fixed latest HISTORY entry to 80 chars/line

commit 18ad209bf7d746715b2d6db3eeaaefa2043ceeda
Author: Julien ROZO <julien AT rozo.org>
Commit: Julien ROZO <julien AT rozo.org>

flite: updated version to 1.4
removed PRE_BUILD and flite-1.3-sharedlibs.patch, compilation goes fine
without

diff --git a/audio-creation/flite/DETAILS b/audio-creation/flite/DETAILS
index bcc982d..5c1e3c1 100755
--- a/audio-creation/flite/DETAILS
+++ b/audio-creation/flite/DETAILS
@@ -1,7 +1,7 @@
SPELL=flite
- VERSION=1.3
- SOURCE=$SPELL-$VERSION-release.tar.gz
-
SOURCE_HASH=sha512:f528dcd103a4c000b62059c4e94dd3673737be92e4cf93474e95b1bbbc596fe487c973cce2ef91a71181ba9a84e9580311ce40bac96bc9ba3544b17074d78d25
+ VERSION=1.4
+ SOURCE=$SPELL-$VERSION-release.tar.bz2
+
SOURCE_HASH=sha512:eec1022077fb7a47db3848ae6944509e18a6c86a25aa24f921b8b6c2af708fc9811b287e76d96cf64fc68f8e1d0a43b7e878659f15bfcf76957eddd75e599112
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION-release

SOURCE_URL[0]=http://www.speech.cs.cmu.edu/$SPELL/packed/$SPELL-$VERSION/$SOURCE
WEB_SITE=http://www.speech.cs.cmu.edu/flite/index.html
diff --git a/audio-creation/flite/HISTORY b/audio-creation/flite/HISTORY
index ff82558..747f719 100644
--- a/audio-creation/flite/HISTORY
+++ b/audio-creation/flite/HISTORY
@@ -1,3 +1,7 @@
+2010-03-02 Julien "_kaze_" ROZO <julien AT rozo.org>
+ * DETAILS: updated version to 1.4
+ * PRE_BUILD, flite-1.3-sharedlibs.patch: removed, compilation goes
fine without
+
2007-08-16 Ethan "eekee" Grammatikidis <eekee57 AT fastmail.fm>
* DETAILS: deilnting (80-col)

diff --git a/audio-creation/flite/PRE_BUILD b/audio-creation/flite/PRE_BUILD
deleted file mode 100755
index 0e5763a..0000000
--- a/audio-creation/flite/PRE_BUILD
+++ /dev/null
@@ -1,3 +0,0 @@
-default_pre_build &&
-cd $SOURCE_DIRECTORY &&
-patch -p1 < $SPELL_DIRECTORY/flite-1.3-sharedlibs.patch
diff --git a/audio-creation/flite/flite-1.3-sharedlibs.patch
b/audio-creation/flite/flite-1.3-sharedlibs.patch
deleted file mode 100644
index ffab925..0000000
--- a/audio-creation/flite/flite-1.3-sharedlibs.patch
+++ /dev/null
@@ -1,170 +0,0 @@
-diff -uNr flite-1.3-release/config/common_make_rules
flite-1.3-release-mod/config/common_make_rules
---- flite-1.3-release/config/common_make_rules 2004-12-20 00:20:43.000000000
+0200
-+++ flite-1.3-release-mod/config/common_make_rules 2006-11-12
12:17:25.000000000 +0200
-@@ -59,27 +59,35 @@
- endif
- OBJDIR=$(BUILDDIR)/obj/$(DIRNAME)
- BINDIR=$(BUILDDIR)/bin
-+LIBDIR=$(BUILDDIR)/lib
- ifeq ($(HOST_PLATFORM),$(TARGET_PLATFORM))
- BINDIR=$(TOP)/bin
-+LIBDIR=$(TOP)/lib
- endif
-
--LIBDIR=$(BUILDDIR)/lib
- BUILDDIRS=$(OBJDIR) $(BINDIR) $(LIBDIR)
-
--FLITELIBS = $(BUILDDIR)/lib/libflite.a
--LDFLAGS += -L$(BUILDDIR)/lib -lflite -lm $(AUDIOLIBS) $(OTHERLIBS)
-+ifdef SHFLAGS
-+FLITELIBS = $(LIBDIR)/libflite.so
-+LDFLAGS += -L$(LIBDIR) -lflite $(OTHERLIBS)
-+else
-+FLITELIBS = $(LIBDIR)/libflite.a
-+LDFLAGS += -L$(LIBDIR) -lflite -lm $(AUDIOLIBS) $(OTHERLIBS)
-+endif
-
- FULLOBJS = $(OBJS:%=$(OBJDIR)/%)
- ifdef SHFLAGS
- SOOBJS = $(OBJS:.o=.os)
--FULLSHOBJS = $(SOOBJS:%=$(OBJDIR)/%)
-+FULLSOOBJS = $(SOOBJS:%=$(OBJDIR)/%)
- ifdef LIBNAME
- ALL += $(OBJDIR)/.build_so
- endif
--endif
-+else
- ifdef LIBNAME
- ALL += $(OBJDIR)/.build_lib
- endif
-+endif
-+
- # Only do some directories when you are not cross compiling
- ifeq ($(HOST_PLATFORM),$(TARGET_PLATFORM))
- OTHER_BUILD_DIRS = $(HOST_ONLY_DIRS)
-@@ -117,14 +125,14 @@
- @ touch $(OBJDIR)/.build_so
-
- # Used in the lib/ directory and in building new voices
--$(OBJDIR)/%.so: %.shared.a
-+%.so: %.shared.a
- @ echo making $@
- @ rm -rf shared_os && mkdir shared_os
-- @ rm -f $@ $(LIBDIR)/$@.${PROJECT_VERSION}
$(LIBDIR)/$@.${PROJECT_SHLIB_VERSION}
-+ @ rm -f $@ $@.${PROJECT_VERSION} $@.${PROJECT_SHLIB_VERSION}
- @ (cd shared_os && ar x ../$<)
-- @ (cd shared_os && $(CC) -shared
-Wl,-soname,$@.${PROJECT_SHLIB_VERSION} -o ../$@.${PROJECT_VERSION} *.os)
-- @ ln -s $(LIBDIR)/$@.${PROJECT_VERSION}
$(LIBDIR)/$@.${PROJECT_SHLIB_VERSION}
-- @ ln -s $(LIBDIR)/$@.${PROJECT_SHLIB_VERSION} $(LIBDIR)/$@
-+ @ (cd shared_os && $(CC) -shared
-Wl,-soname,$@.${PROJECT_SHLIB_VERSION} -o ../$@.${PROJECT_VERSION} *.os
-L../ $($(@:%.so=%_LDLIBS)))
-+ @ ln -s $@.${PROJECT_VERSION} $@.${PROJECT_SHLIB_VERSION}
-+ @ ln -s $@.${PROJECT_SHLIB_VERSION} $@
- @ rm -rf shared_os
-
- $(OBJDIR)/.make_build_dirs:
-diff -uNr flite-1.3-release/lib/Makefile flite-1.3-release-mod/lib/Makefile
---- flite-1.3-release/lib/Makefile 1970-01-01 02:00:00.000000000 +0200
-+++ flite-1.3-release-mod/lib/Makefile 2006-11-12 12:17:40.000000000 +0200
-@@ -0,0 +1,73 @@
-+###########################################################################
-+## ##
-+## Language Technologies Institute ##
-+## Carnegie Mellon University ##
-+## Copyright (c) 1999 ##
-+## All Rights Reserved. ##
-+## ##
-+## Permission is hereby granted, free of charge, to use and distribute ##
-+## this software and its documentation without restriction, including ##
-+## without limitation the rights to use, copy, modify, merge, publish, ##
-+## distribute, sublicense, and/or sell copies of this work, and to ##
-+## permit persons to whom this work is furnished to do so, subject to ##
-+## the following conditions: ##
-+## 1. The code must retain the above copyright notice, this list of ##
-+## conditions and the following disclaimer. ##
-+## 2. Any modifications must be clearly marked as such. ##
-+## 3. Original authors' names are not deleted. ##
-+## 4. The authors' names are not used to endorse or promote products ##
-+## derived from this software without specific prior written ##
-+## permission. ##
-+## ##
-+## CARNEGIE MELLON UNIVERSITY AND THE CONTRIBUTORS TO THIS WORK ##
-+## DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ##
-+## ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT ##
-+## SHALL CARNEGIE MELLON UNIVERSITY NOR THE CONTRIBUTORS BE LIABLE ##
-+## FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES ##
-+## WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN ##
-+## AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ##
-+## ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF ##
-+## THIS SOFTWARE. ##
-+## ##
-+###########################################################################
-+## ##
-+## FLITE libraries ##
-+## ##
-+###########################################################################
-+TOP=..
-+DIRNAME=lib
-+BUILD_DIRS =
-+ALL_DIRS=
-+FILES = Makefile
-+LIBNAMES = flite flite_cmulex flite_usenglish \
-+ flite_cmu_us_kal flite_cmu_us_kal16 flite_cmu_time_awb
-+
-+STATICLIBS= $(LIBNAMES:%=lib%.a)
-+SHAREDARLIBS= $(LIBNAMES:%=lib%.shared.a)
-+#SHAREDLIBS = $(LIBNAMES:%=lib%.so)
-+SHAREDLIBS = $(SHAREDARLIBS:%.shared.a=%.so)
-+VERSIONSHAREDLIBS = $(SHAREDLIBS:%=%.${PROJECT_VERSION}) \
-+ $(SHAREDLIBS:%=%.${PROJECT_SHLIB_VERSION})
-+ALL_LIBS = $(SHAREDLIBS) $(VERSIONSHAREDLIBS)
-+
-+ALL = shared_libs
-+
-+LOCAL_CLEAN=*.a *.so *.so.${PROJECT_VERSION} *.so.${PROJECT_SHLIB_VERSION}
-+
-+include $(TOP)/config/common_make_rules
-+
-+ifdef SHFLAGS
-+shared_libs: $(SHAREDLIBS)
-+libflite_LDLIBS = -lm $(AUDIOLIBS)
-+libflite_cmulex_LDLIBS = -lflite
-+libflite_usenglish_LDLIBS = -lflite
-+libflite_cmu_us_kal_LDLIBS = -lflite_cmulex -lflite_usenglish
-+libflite_cmu_us_kal16_LDLIBS = -lflite_cmulex -lflite_usenglish
-+libflite_cmu_time_awb_LDLIBS = -lflite -lflite_cmulex -lflite_usenglish
-+else
-+shared_libs: nothing
-+endif
-+
-+install:
-+ @ tar cvf - $(ALL_LIBS) | ( cd $(INSTALLLIBDIR) && tar xf -)
-+
-diff -uNr flite-1.3-release/main/Makefile flite-1.3-release-mod/main/Makefile
---- flite-1.3-release/main/Makefile 2005-08-08 00:38:42.000000000 +0200
-+++ flite-1.3-release-mod/main/Makefile 2006-11-12 11:44:46.000000000
+0200
-@@ -50,11 +50,11 @@
-
- flite_LIBS = flite_$(FL_VOX) flite_$(FL_LANG) flite_$(FL_LEX)
- flite_LIBS_flags = -L$(LIBDIR) $(flite_LIBS:%=-l%)
--flite_LIBS_deps = $(flite_LIBS:%=$(LIBDIR)/lib%.a)
-+flite_LIBS_deps = $(flite_LIBS:%=$(LIBDIR)/lib%.so)
-
- flite_time_LIBS = flite_cmu_time_awb flite_$(FL_LANG) flite_$(FL_LEX)
- flite_time_LIBS_flags = -L$(LIBDIR) $(flite_time_LIBS:%=-l%)
--flite_time_LIBS_deps = $(flite_time_LIBS:%=$(LIBDIR)/lib%.a)
-+flite_time_LIBS_deps = $(flite_time_LIBS:%=$(LIBDIR)/lib%.so)
-
- include $(TOP)/config/common_make_rules
-
-diff -uNr flite-1.3-release/Makefile flite-1.3-release-mod/Makefile
---- flite-1.3-release/Makefile 2005-11-01 15:40:45.000000000 +0200
-+++ flite-1.3-release-mod/Makefile 2006-11-12 11:44:46.000000000 +0200
-@@ -41,7 +41,7 @@
- ###########################################################################
- TOP=.
- DIRNAME=
--BUILD_DIRS = include src lang doc
-+BUILD_DIRS = include src lang lib doc
- ALL_DIRS=config $(BUILD_DIRS) testsuite sapi palm tools main
- CONFIG=configure configure.in config.sub config.guess \
- missing install-sh mkinstalldirs
diff --git a/http/modsecurity/DETAILS b/http/modsecurity/DETAILS
index 11c8920..c0c50e8 100755
--- a/http/modsecurity/DETAILS
+++ b/http/modsecurity/DETAILS
@@ -1,5 +1,5 @@
SPELL=modsecurity
- VERSION=2.5.7
+ VERSION=2.5.12
SOURCE=$SPELL-apache_$VERSION.tar.gz
SOURCE2=${SOURCE}.asc
SOURCE2_IGNORE=signature
diff --git a/http/modsecurity/HISTORY b/http/modsecurity/HISTORY
index c156480..4dbae43 100644
--- a/http/modsecurity/HISTORY
+++ b/http/modsecurity/HISTORY
@@ -1,3 +1,9 @@
+2010-03-02 Julien "_kaze_" ROZO <julien AT rozo.org>
+ * DETAILS: updated version to 2.5.12
+ * modsecurity.gpg: updated public key for Brian Rectanus since the
old one
+ has expired
+
2008-10-07 David Kowis <dkowis AT shlrm.org>
- * DETAILS, DEPENDS, BUILD: Created this spell, had to unset LDFLAGS,
because upstream is retarded
+ * DETAILS, DEPENDS, BUILD: Created this spell, had to unset LDFLAGS,
because
+ upstream is retarded
* modsecurity.gpg: added the upstream devs keys
diff --git a/http/modsecurity/modsecurity.gpg
b/http/modsecurity/modsecurity.gpg
index 9609d83..5895b48 100644
Binary files a/http/modsecurity/modsecurity.gpg and
b/http/modsecurity/modsecurity.gpg differ


  • [SM-Commit] GIT changes to master grimoire by Julien ROZO (f96a942225bbcbe6cd0558200b72b057f3129a2f), Julien ROZO, 03/02/2010

Archive powered by MHonArc 2.6.24.

Top of Page