+++ /dev/null
-###############################################################################
-# IPFire.org - An Open Source Firewall Solution #
-# Copyright (C) - IPFire Development Team <info@ipfire.org> #
-###############################################################################
-
-name = libaal
-version = 1.0.5
-release = 1
-
-groups = System/Filesystems
-url = http://www.kernel.org/pub/linux/utils/fs/reiser4/libaal/
-license = GPL
-summary = Reiser4's application abstraction library.
-
-description
- This library is part of the Reiser4's filesystem support tools.
-end
-
-source_dl =
-
-build
- requires
- gcc-c++
- end
-
- configure_options += \
- --libdir=/lib
-
- install_cmds
- rm -vf %{BUILDROOT}/lib/libaal{,-minimal}.so
- mkdir -pv %{BUILDROOT}/usr/lib
- ln -svf ../../lib/libaal-1.0.so.5 %{BUILDROOT}/usr/lib/libaal-1.0.so
- ln -svf libaal-1.0.so %{BUILDROOT}/usr/lib/libaal.so
- ln -svf ../../lib/libaal-minimal.so.0 %{BUILDROOT}/usr/lib/libaal-minimal.so
- end
-end
-
-packages
- package %{name}
- end
-
- package %{name}-devel
- template DEVEL
- end
-
- package %{name}-debuginfo
- template DEBUGINFO
- end
-end
###############################################################################
name = libpng
-version = 1.5.6
+version = 1.5.7
release = 1
groups = System/Libraries
name = memtest86+
version = 4.20
-release = 2
+release = 3
groups = System/Base
url = http://www.memtest.org/
packages
package %{name}
-
- package %{name}-debuginfo
- template DEBUGINFO
- end
end
--- /dev/null
+--- perl-tk-804.027.orig/objGlue.c
++++ perl-tk-804.027/objGlue.c
+@@ -529,6 +529,10 @@
+ sv_utf8_upgrade(objPtr);
+ #endif
+ s = SvPV(objPtr, len);
++ if (!s)
++ {
++ return NULL;
++ }
+ #ifdef SvUTF8
+ if (!is_utf8_string(s,len))
+ {
+@@ -555,6 +559,10 @@
+ else
+ {
+ s = LangString(objPtr);
++ if (!s)
++ {
++ return NULL;
++ }
+ #ifdef SvUTF8
+ if (!is_utf8_string(s,strlen(s)))
+ {
+--- perl-tk-804.027.orig/pTk/mTk/generic/tkFont.c
++++ perl-tk-804.027/pTk/mTk/generic/tkFont.c
+@@ -1044,6 +1044,7 @@
+ TkFont *fontPtr, *firstFontPtr, *oldFontPtr;
+ int new, descent;
+ NamedFont *nfPtr;
++ char *fontString;
+
+ fiPtr = ((TkWindow *) tkwin)->mainPtr->fontInfoPtr;
+ if (objPtr->typePtr != &tkFontObjType) {
+@@ -1077,8 +1078,12 @@
+ cacheHashPtr = oldFontPtr->cacheHashPtr;
+ FreeFontObjProc(objPtr);
+ } else {
++ fontString = Tcl_GetString(objPtr);
++ if (fontString == NULL) {
++ fontString = "";
++ }
+ cacheHashPtr = Tcl_CreateHashEntry(&fiPtr->fontCache,
+- Tcl_GetString(objPtr), &new);
++ fontString, &new);
+ }
+ firstFontPtr = (TkFont *) Tcl_GetHashValue(cacheHashPtr);
+ for (fontPtr = firstFontPtr; (fontPtr != NULL);
+@@ -1095,8 +1100,12 @@
+ * The desired font isn't in the table. Make a new one.
+ */
+
++ fontString = Tcl_GetString(objPtr);
++ if (fontString == NULL) {
++ fontString = "";
++ }
+ namedHashPtr = Tcl_FindHashEntry(&fiPtr->namedTable,
+- Tcl_GetString(objPtr));
++ fontString);
+ if (namedHashPtr != NULL) {
+ /*
+ * Construct a font based on a named font.
+@@ -1111,7 +1120,7 @@
+ * Native font?
+ */
+
+- fontPtr = TkpGetNativeFont(tkwin, Tcl_GetString(objPtr));
++ fontPtr = TkpGetNativeFont(tkwin, fontString);
+ if (fontPtr == NULL) {
+ TkFontAttributes fa;
+ Tcl_Obj *dupObjPtr = Tcl_DuplicateObj(objPtr);
--- /dev/null
+diff -up Tk-804.028/pTk/mTk/generic/tkConfig.c.seg Tk-804.028/pTk/mTk/generic/tkConfig.c
+--- Tk-804.028/pTk/mTk/generic/tkConfig.c.seg 2008-03-11 23:29:39.000000000 -0400
++++ Tk-804.028/pTk/mTk/generic/tkConfig.c 2008-03-11 23:28:09.000000000 -0400
+@@ -1210,11 +1210,11 @@ GetOptionFromObj(interp, objPtr, tablePt
+ * First, check to see if the object already has the answer cached.
+ */
+
+- if (objPtr->typePtr == &tkOptionObjType) {
++/* if (objPtr->typePtr == &tkOptionObjType) {
+ if (objPtr->internalRep.twoPtrValue.ptr1 == (VOID *) tablePtr) {
+ return (Option *) objPtr->internalRep.twoPtrValue.ptr2;
+ }
+- }
++ }*/
+
+ /*
+ * The answer isn't cached.
+@@ -2277,9 +2277,15 @@ Tk_GetOptionValue(interp, recordPtr, opt
+ if (optionPtr == NULL) {
+ return NULL;
+ }
++
++ if (optionPtr->specPtr == NULL) {
++ return NULL;
++ }
++
+ if (optionPtr->specPtr->type == TK_OPTION_SYNONYM) {
+ optionPtr = optionPtr->extra.synonymPtr;
+ }
++
+ if (optionPtr->specPtr->objOffset >= 0) {
+ resultPtr = *((Tcl_Obj **) (recordPtr + optionPtr->specPtr->objOffset));
+ if (resultPtr == NULL) {
--- /dev/null
+--- demos/widget.orig 2008-01-02 13:24:14.000000000 +0100
++++ demos/widget 2008-01-02 13:27:10.000000000 +0100
+@@ -3,7 +3,8 @@
+ use 5.008;
+ use Config;
+ use Tk 804.000;
+-use lib Tk->findINC( 'demos/widget_lib' );
++#use lib Tk->findINC( 'demos/widget_lib' );
++use lib "@demopath@/widget_lib";
+ use Tk::widgets qw/ DialogBox ErrorDialog LabEntry ROText /;
+ use Tk::Config ();
+ use WidgetDemo;
+@@ -62,9 +63,11 @@
+ $l->destroy;
+ }
+
+-my $widget_lib = Tk->findINC('demos/widget_lib');
++#my $widget_lib = Tk->findINC('demos/widget_lib');
++my $widget_lib = "@demopath@/widget_lib";
+ my $wd = "$widget_lib/WidgetDemo.pm";
+-$WIDTRIB = Tk->findINC('demos/widtrib');
++#$WIDTRIB = Tk->findINC('demos/widtrib');
++$WIDTRIB = "@demopath@/widtrib";
+ unless (Tk::tainting) {
+ $WIDTRIB = $ENV{WIDTRIB} if defined $ENV{WIDTRIB};
+ $WIDTRIB = $ARGV[0] if defined $ARGV[0];
--- /dev/null
+###############################################################################
+# IPFire.org - An Open Source Firewall Solution #
+# Copyright (C) - IPFire Development Team <info@ipfire.org> #
+###############################################################################
+
+name = perl-Tk
+version = 804.029
+release = 1
+thisapp = Tk-%{version}
+
+groups = Development/Libraries
+url = http://search.cpan.org/dist/Tk/
+license = GPL+ or Artistic
+summary = Perl Graphical User Interface ToolKit.
+
+description
+ This a re-port of a perl interface to Tk8.4.
+ C code is derived from Tcl/Tk8.4.5.
+ It also includes all the C code parts of Tix8.1.4 from SourceForge.
+ The perl code corresponding to Tix's Tcl code is not fully implemented.
+
+ Perl API is essentially the same as Tk800 series Tk800.025 but has not
+ been verified as compliant. There ARE differences see pod/804delta.pod.
+end
+
+source_dl = http://cpan.org/modules/by-module/Tk/
+
+build
+ requires
+ perl(ExtUtils::ParseXS)
+ perl(ExtUtils::MakeMaker)
+ perl-devel
+ libjpeg-devel
+ libpng-devel
+ libX11-devel
+ libXft-devel
+ end
+
+ build
+ perl Makefile.PL INSTALLDIRS=vendor X11LIB=%{libdir} XFT=1
+ make %{PARALLELISMFLAGS}
+ end
+
+ install
+ make pure_install PERL_INSTALL_ROOT=%{BUILDROOT}
+ end
+end
+
+packages
+ package %{name}
+ provides
+ perl(Tk::LabRadio) = 4.004
+ perl(Tk::TextReindex)
+ perl(Tk) = %{version}
+ end
+ end
+
+ package %{name}-devel
+ template DEVEL
+ end
+
+ package %{name}-debuginfo
+ template DEBUGINFO
+ end
+end
+++ /dev/null
-diff -Naur reiser4progs-1.0.7.org/plugin/node/node40/node40.c reiser4progs-1.0.7/plugin/node/node40/node40.c
---- reiser4progs-1.0.7.org/plugin/node/node40/node40.c 2009-01-08 22:34:27.000000000 +0100
-+++ reiser4progs-1.0.7/plugin/node/node40/node40.c 2009-04-28 14:15:04.000000000 +0200
-@@ -996,7 +996,7 @@
- func = cb_comp_key3;
- #elif defined(ENABLE_LARGE_KEYS)
- func = cb_comp_key4;
--#elif
-+#else
- func = NULL;
- #endif
-
+++ /dev/null
-diff -Nur old/configure.in new/configure.in
---- old/configure.in 2010-02-23 16:00:54.000000000 +0100
-+++ new/configure.in 2010-02-23 16:00:15.000000000 +0100
-@@ -71,7 +71,7 @@
- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
-
- OLD_CFLAGS=$CFLAGS
--CFLAGS="$CFLAGS -static"
-+CFLAGS="$CFLAGS"
-
- # Compare MINIMUM-VERSION with libaal version
- AC_TRY_RUN([
+++ /dev/null
---- reiser4progs-1.0.6/include/repair/Makefile.am.wiget 2009-08-28 19:11:05.000000000 +0200
-+++ reiser4progs-1.0.6/include/repair/Makefile.am 2009-08-28 19:11:34.000000000 +0200
-@@ -3,4 +3,4 @@ repairinclude_HEADERS = librepair.h re
- master.h format.h journal.h node.h place.h item.h \
- filter.h disk_scan.h twig_scan.h add_missing.h \
- semantic.h lost_found.h cleanup.h tree.h alloc.h \
-- object.h status.h backup.h oid.h pset.h
-+ status.h backup.h oid.h pset.h
+++ /dev/null
---- reiser4progs-1.0.2/configure.in.orig 2004-10-21 19:38:08.000000000 +0200
-+++ reiser4progs-1.0.2/configure.in 2004-10-24 22:08:44.861671296 +0200
-@@ -576,13 +576,8 @@
-
- CFLAGS="$CFLAGS -W -Wall"
-
--if test x$enable_debug = xyes; then
-- GENERIC_CFLAGS="$GENERIC_CFLAGS -O1 -g"
-- MINIMAL_CFLAGS="$MINIMAL_CFLAGS -O1 -g"
--else
-- GENERIC_CFLAGS="$GENERIC_CFLAGS -O3"
-- MINIMAL_CFLAGS="$MINIMAL_CFLAGS -Os"
--
-+MINIMAL_CFLAGS="$MINIMAL_CFLAGS -Os"
-+if test x$enable_debug != xyes; then
- if test x$uninitialized = xyes; then
- CFLAGS="$CFLAGS -Wuninitialized"
- fi
+++ /dev/null
-###############################################################################
-# IPFire.org - An Open Source Firewall Solution #
-# Copyright (C) - IPFire Development Team <info@ipfire.org> #
-###############################################################################
-
-name = reiser4progs
-version = 1.0.7
-release = 1
-
-groups = System/Filesystems
-url = http://www.kernel.org/pub/linux/utils/fs/reiser4/reiser4progs/
-license = GPL
-summary = Administration utilities for the Reiser4 filesystem.
-
-description
- The filesystem utilities for the reiser4 filesystem, including: \
- fsck.reiser4, measurefs.reiser4, mkfs.reiser4 and resizefs.reiser4.
-end
-
-source_dl = http://www.kernel.org/pub/linux/utils/fs/reiser4/reiser4progs/
-sources = %{thisapp}.tar.bz2
-
-build
- requires
- autoconf
- automake
- e2fsprogs-devel
- libaal-devel
- libtool
- libuuid-devel
- ncurses-devel
- readline-devel
- end
-
- configure_options += \
- --sbindir=/sbin \
- --libdir=/lib \
- --disable-static \
- --disable-libminimal
-
- prepare_cmds
- # Regenerate the buildsystem
- libtoolize --install
- aclocal
- autoheader
- autoconf
- automake --add-missing
- end
-
- install_cmds
- rm -vf %{BUILDROOT}/lib/lib{reiser4,repair}.so
- mkdir -pv %{BUILDROOT}/usr/lib
- ln -svf ../../lib/libreiser4-1.0.so.7 %{BUILDROOT}/usr/lib/libreiser4-1.0.so
- ln -svf ../../lib/librepair-1.0.so.7 %{BUILDROOT}/usr/lib/librepair-1.0.so
- end
-end
-
-packages
- package %{name}
- end
-
- package %{name}-devel
- template DEVEL
- end
-
- package %{name}-debuginfo
- template DEBUGINFO
- end
-end
projects / people / ms / ipfire-3.x.git / commitdiff
