[csw-devel] SF.net SVN: gar:[10587] csw/mgar/pkg/mysql5/branches/mysql-5.1.x-optcsw
wahwah at users.sourceforge.net
wahwah at users.sourceforge.net
Mon Jul 26 17:28:22 CEST 2010
Revision: 10587
http://gar.svn.sourceforge.net/gar/?rev=10587&view=rev
Author: wahwah
Date: 2010-07-26 15:28:22 +0000 (Mon, 26 Jul 2010)
Log Message:
-----------
mysql5.1: Fixing a patch to apply to 5.1.
Modified Paths:
--------------
csw/mgar/pkg/mysql5/branches/mysql-5.1.x-optcsw/Makefile
csw/mgar/pkg/mysql5/branches/mysql-5.1.x-optcsw/checksums
csw/mgar/pkg/mysql5/branches/mysql-5.1.x-optcsw/files/0001-Use-libc-not-libcrypt.patch
Modified: csw/mgar/pkg/mysql5/branches/mysql-5.1.x-optcsw/Makefile
===================================================================
--- csw/mgar/pkg/mysql5/branches/mysql-5.1.x-optcsw/Makefile 2010-07-26 12:09:55 UTC (rev 10586)
+++ csw/mgar/pkg/mysql5/branches/mysql-5.1.x-optcsw/Makefile 2010-07-26 15:28:22 UTC (rev 10587)
@@ -5,7 +5,7 @@
PROJ_NAME = mysql
GARNAME = $(PROJ_NAME)51
BASE_VERSION = 5.1
-PATCHLEVEL = 44
+PATCHLEVEL = 49
GARVERSION = $(BASE_VERSION).$(PATCHLEVEL)
CATEGORIES = server
@@ -130,14 +130,11 @@
RUNTIME_DEP_PKGS_CSW$(GARNAME) += CSWzlib
RUNTIME_DEP_PKGS_CSW$(GARNAME)rt = CSWosslrt
RUNTIME_DEP_PKGS_CSW$(GARNAME)rt += CSWzlib
-RUNTIME_DEP_PKGS_CSW$(GARNAME)bench = CSW$(GARNAME)
RUNTIME_DEP_PKGS_CSW$(GARNAME)bench += CSWperl
RUNTIME_DEP_PKGS_CSW$(GARNAME)client = CSW$(GARNAME)rt
RUNTIME_DEP_PKGS_CSW$(GARNAME)client += CSWosslrt
RUNTIME_DEP_PKGS_CSW$(GARNAME)client += CSWncurses
RUNTIME_DEP_PKGS_CSW$(GARNAME)client += CSWzlib
-RUNTIME_DEP_PKGS_CSW$(GARNAME)devel = CSW$(GARNAME)rt
-RUNTIME_DEP_PKGS_CSW$(GARNAME)test = CSW$(GARNAME)
RUNTIME_DEP_PKGS_CSW$(GARNAME)test += CSWperl
MASTER_SITES = ftp://mirror.switch.ch/mirror/mysql/Downloads/MySQL-$(BASE_VERSION)/
@@ -200,26 +197,27 @@
PROTOTYPE_PERMS_dbdir = 0700
PROTOTYPE_CLASS_dbdir = ugfiles
+CHECKPKG_OVERRIDES_CSWmysql51 += surplus-dependency|CSWmysql51client
+CHECKPKG_OVERRIDES_CSWmysql51rt += bad-rpath-entry
+
include gar/category.mk
CFLAGS := $(filter-out -I%,$(CFLAGS))
-CHECKPKG_OVERRIDES_CSWmysql51devel += missing-dependency|CSWmysql51
-
test-custom:
alias sh=/usr/bin/bash; \
cd $(WORKSRC)/mysql-test; \
perl mysql-test-run.pl --mem --big-test --force \
--skip-test=archive-big --skip-test=/gis/
-pre-configure-modulated:
- # To work around the following libtool version mismatch problem:
- # libtool: Version mismatch error. This is libtool 2.2.6, but the
- # libtool: definition of this LT_INIT comes from libtool 2.2.6b.
- # libtool: You should recreate aclocal.m4 with macros from libtool 2.2.6
- # http://lists.opencsw.org/pipermail/maintainers/2009-December/005066.html
- cd $(WORKSRC) && autoreconf --force --install --symlink
- @$(MAKECOOKIE)
+# pre-configure-modulated:
+# # To work around the following libtool version mismatch problem:
+# # libtool: Version mismatch error. This is libtool 2.2.6, but the
+# # libtool: definition of this LT_INIT comes from libtool 2.2.6b.
+# # libtool: You should recreate aclocal.m4 with macros from libtool 2.2.6
+# # http://lists.opencsw.org/pipermail/maintainers/2009-December/005066.html
+# cd $(WORKSRC) && autoreconf --force --install --symlink
+# @$(MAKECOOKIE)
post-merge:
ginstall -m 755 -d $(PKGROOT)$(localstatedir)
Modified: csw/mgar/pkg/mysql5/branches/mysql-5.1.x-optcsw/checksums
===================================================================
--- csw/mgar/pkg/mysql5/branches/mysql-5.1.x-optcsw/checksums 2010-07-26 12:09:55 UTC (rev 10586)
+++ csw/mgar/pkg/mysql5/branches/mysql-5.1.x-optcsw/checksums 2010-07-26 15:28:22 UTC (rev 10587)
@@ -1,4 +1,4 @@
-a0b98a7320bce2da3e1f90da704d3c85 0001-Use-libc-not-libcrypt.patch
+8940e0673e599689932e94fec906aec9 0001-Use-libc-not-libcrypt.patch
1414d06fab1530484a508927a0de4154 0002-cast-user_info-pw_gid-to-gid_t.patch
5415f365f1b0f7a179d1efc25f45bbee 0003-OpenCSW-perl-for-tests.patch
8ab232cd4d232b3cda3bbced93f80237 0004-basedir-and-datadir-in-the-cnf-files.patch
@@ -8,5 +8,5 @@
e42afb5ec1b1ab02d2ec3b46d0922636 README.CSW
7124b641ff82ee17033ce8f573700c89 cswmysql51
67228e1f096fe08a94f4267439a4ec36 cswusergroup
-a16fa6d6c7f40a963919cbc1c5e86111 mysql-5.1.44.tar.gz
+a90d87a71fa3c23dff6d78afc8e3184c mysql-5.1.49.tar.gz
90b7cfcd11ab56e021a195a6a085fa21 quick_start-csw
Modified: csw/mgar/pkg/mysql5/branches/mysql-5.1.x-optcsw/files/0001-Use-libc-not-libcrypt.patch
===================================================================
--- csw/mgar/pkg/mysql5/branches/mysql-5.1.x-optcsw/files/0001-Use-libc-not-libcrypt.patch 2010-07-26 12:09:55 UTC (rev 10586)
+++ csw/mgar/pkg/mysql5/branches/mysql-5.1.x-optcsw/files/0001-Use-libc-not-libcrypt.patch 2010-07-26 15:28:22 UTC (rev 10587)
@@ -1,19 +1,19 @@
-From a527f284ef5646dbdd731af007aace3daee3e946 Mon Sep 17 00:00:00 2001
-From: =?utf-8?q?Maciej=20Blizi=C5=84ski?= <blizinski at google.com>
-Date: Wed, 16 Sep 2009 01:27:38 +0100
-Subject: [PATCH 1/4] Use libc, not libcrypt
+From 6925aace1b489a5ffb0265c7fdc7edc3def7d995 Mon Sep 17 00:00:00 2001
+From: Maciej Blizinski <maciej at opencsw.org>
+Date: Mon, 26 Jul 2010 08:03:17 +0200
+Subject: [PATCH] Use libc not libcrypt
---
configure.in | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/configure.in b/configure.in
-index ec432e1..577cfe3 100644
+index 7374723..1c181c7 100644
--- a/configure.in
+++ b/configure.in
-@@ -891,7 +891,10 @@ AC_CHECK_FUNC(p2open, , AC_CHECK_LIB(gen, p2open))
+@@ -860,7 +860,10 @@ AC_SEARCH_LIBS(setsockopt, socket)
# This may get things to compile even if bind-8 is installed
- AC_CHECK_FUNC(bind, , AC_CHECK_LIB(bind, bind))
+ AC_SEARCH_LIBS(bind, bind)
# Check if crypt() exists in libc or libcrypt, sets LIBS if needed
-AC_SEARCH_LIBS(crypt, crypt, AC_DEFINE(HAVE_CRYPT, 1, [crypt]))
+## AC_SEARCH_LIBS(crypt, crypt, AC_DEFINE(HAVE_CRYPT, 1, [crypt]))
@@ -24,5 +24,5 @@
AC_SEARCH_LIBS(inet_aton, [socket nsl resolv])
--
-1.6.3.2
+1.7.1
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the devel
mailing list