rpms/hercules/EL-5 hercules-3.06-ltdl.patch, NONE, 1.1 hercules-3.06-preproc.patch, NONE, 1.1 .cvsignore, 1.6, 1.7 hercules.spec, 1.15, 1.16 sources, 1.6, 1.7
Dan Horák
sharkcz at fedoraproject.org
Thu Feb 19 06:56:01 UTC 2009
- Previous message (by thread): rpms/hercules/F-9 hercules-3.06-ltdl.patch, NONE, 1.1 hercules-3.06-preproc.patch, NONE, 1.1 .cvsignore, 1.7, 1.8 hercules.spec, 1.22, 1.23 sources, 1.7, 1.8
- Next message (by thread): rpms/gnome-applets/devel gnome-applets-resizeable.patch,1.1,1.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: sharkcz
Update of /cvs/pkgs/rpms/hercules/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10304
Modified Files:
.cvsignore hercules.spec sources
Added Files:
hercules-3.06-ltdl.patch hercules-3.06-preproc.patch
Log Message:
* Wed Feb 18 2009 Dan Horak <dan[at]danny.cz> 3.06-1
- update to upstream version 3.06
- use system ltdl library
hercules-3.06-ltdl.patch:
--- NEW FILE hercules-3.06-ltdl.patch ---
>From b6c43f688dda45749e6a7a1a06a72427a07c8789 Mon Sep 17 00:00:00 2001
From: Dan Horak <dan at danny.cz>
Date: Wed, 18 Feb 2009 21:42:09 +0100
Subject: [PATCH] use system ltdl library
---
Makefile.am | 11 +-
ltdl.c | 4501 -----------------------------------------------------------
ltdl.h | 366 -----
3 files changed, 3 insertions(+), 4875 deletions(-)
delete mode 100644 ltdl.c
delete mode 100644 ltdl.h
diff --git a/Makefile.am b/Makefile.am
index 4e17f6b..8749fae 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -168,7 +168,6 @@ endif
if OPTION_DYNAMIC_LOAD
DYNSRC =
- LTDL = ltdl.c
DYNMOD_LD_FLAGS = -module \
-no-undefined \
@@ -187,7 +186,6 @@ if OPTION_DYNAMIC_LOAD
-avoid-version
else
DYNSRC = $(dyndev_SRC)
- LTDL =
DYNMOD_LD_FLAGS =
DYNMOD_LD_ADD =
LIB_LD_FLAGS = $(XSTATIC) \
@@ -361,10 +359,9 @@ endif
parser.c \
pttrace.c \
$(FTHREADS) \
- $(FISHHANG) \
- $(LTDL)
+ $(FISHHANG)
- libhercu_la_LDFLAGS = $(LIB_LD_FLAGS)
+ libhercu_la_LDFLAGS = $(LIB_LD_FLAGS) -lltdl
libhercu_la_LIBADD = $(LDADD) libhercs.la
@@ -437,8 +434,7 @@ endif
memrchr.c \
$(dynamic_SRC) \
$(extra_SRC) \
- $(dyndev_SRC) \
- ltdl.c
+ $(dyndev_SRC)
libherc_la_LDFLAGS = $(LIB_LD_FLAGS)
@@ -725,7 +721,6 @@ noinst_HEADERS = fishhang.h \
hdl.h \
crypto.h \
sockdev.h \
- ltdl.h \
herc_getopt.h \
service.h \
chsc.h \
diff --git a/ltdl.c b/ltdl.c
deleted file mode 100644
index 4886921..0000000
--- a/ltdl.c
+++ /dev/null
@@ -1,4501 +0,0 @@
-/* ltdl.c -- system independent dlopen wrapper
- Copyright (C) 1998, 1999, 2000 Free Software Foundation, Inc.
- Originally by Thomas Tanner <tanner at ffii.org>
- This file is part of GNU Libtool.
-
-This library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Lesser General Public
-License as published by the Free Software Foundation; either
-version 2 of the License, or (at your option) any later version.
-
-As a special exception to the GNU Lesser General Public License,
-if you distribute this file as part of a program or library that
-is built using GNU libtool, you may include it under the same
-distribution terms that you use for the rest of that program.
-
-This library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-Lesser General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public
-License along with this library; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-02111-1307 USA
-
-*/
-
-#if HAVE_CONFIG_H
- #include "config.h" // Hercules build configuration options/settings
-#endif
-
-#if defined(HDL_USE_LIBTOOL)
-
-#if HAVE_UNISTD_H
-# include <unistd.h>
-#endif
-
-#if HAVE_STDIO_H
-# include <stdio.h>
-#endif
-
-#if HAVE_STDLIB_H
-# include <stdlib.h>
-#endif
-
-#if HAVE_STRING_H
-# include <string.h>
-#else
-# if HAVE_STRINGS_H
-# include <strings.h>
-# endif
-#endif
-
-#if HAVE_CTYPE_H
-# include <ctype.h>
-#endif
-
-#if HAVE_MALLOC_H
-# include <malloc.h>
-#endif
-
-#if HAVE_MEMORY_H
-# include <memory.h>
-#endif
-
-#if HAVE_ERRNO_H
-# include <errno.h>
-#endif
-
-
-#ifndef __WINDOWS__
-# ifdef __WIN32__
-# define __WINDOWS__
-# endif
-#endif
-
-
-#undef LT_USE_POSIX_DIRENT
-#ifdef HAVE_CLOSEDIR
-# ifdef HAVE_OPENDIR
-# ifdef HAVE_READDIR
-# ifdef HAVE_DIRENT_H
-# define LT_USE_POSIX_DIRENT
-# endif /* HAVE_DIRENT_H */
-# endif /* HAVE_READDIR */
-# endif /* HAVE_OPENDIR */
-#endif /* HAVE_CLOSEDIR */
-
-
-#undef LT_USE_WINDOWS_DIRENT_EMULATION
-#ifndef LT_USE_POSIX_DIRENT
-# ifdef __WINDOWS__
-# define LT_USE_WINDOWS_DIRENT_EMULATION
-# endif /* __WINDOWS__ */
-#endif /* LT_USE_POSIX_DIRENT */
-
-
-#ifdef LT_USE_POSIX_DIRENT
-# include <dirent.h>
-# define LT_D_NAMLEN(dirent) (strlen((dirent)->d_name))
-#else
-# ifdef LT_USE_WINDOWS_DIRENT_EMULATION
-# define LT_D_NAMLEN(dirent) (strlen((dirent)->d_name))
-# else
-# define dirent direct
-# define LT_D_NAMLEN(dirent) ((dirent)->d_namlen)
-# if HAVE_SYS_NDIR_H
-# include <sys/ndir.h>
-# endif
-# if HAVE_SYS_DIR_H
-# include <sys/dir.h>
-# endif
-# if HAVE_NDIR_H
-# include <ndir.h>
-# endif
-# endif
-#endif
-
-#if HAVE_ARGZ_H
-# include <argz.h>
-#endif
-
-#if HAVE_ASSERT_H
-# include <assert.h>
-#else
-# define assert(arg) ((void) 0)
-#endif
-
-#include "ltdl.h"
[...4547 lines suppressed...]
-/* Portable libltdl versions of the system dlopen() API. */
-LT_SCOPE lt_dlhandle lt_dlopen LT_PARAMS((const char *filename));
-LT_SCOPE lt_dlhandle lt_dlopenext LT_PARAMS((const char *filename));
-LT_SCOPE lt_ptr lt_dlsym LT_PARAMS((lt_dlhandle handle,
- const char *name));
-LT_SCOPE const char *lt_dlerror LT_PARAMS((void));
-LT_SCOPE int lt_dlclose LT_PARAMS((lt_dlhandle handle));
-
-/* Module residency management. */
-LT_SCOPE int lt_dlmakeresident LT_PARAMS((lt_dlhandle handle));
-LT_SCOPE int lt_dlisresident LT_PARAMS((lt_dlhandle handle));
-
-
-
-
-/* --- MUTEX LOCKING --- */
-
-
-typedef void lt_dlmutex_lock LT_PARAMS((void));
-typedef void lt_dlmutex_unlock LT_PARAMS((void));
-typedef void lt_dlmutex_seterror LT_PARAMS((const char *errmsg));
-typedef const char *lt_dlmutex_geterror LT_PARAMS((void));
-
-LT_SCOPE int lt_dlmutex_register LT_PARAMS((lt_dlmutex_lock *lock,
- lt_dlmutex_unlock *unlock,
- lt_dlmutex_seterror *seterror,
- lt_dlmutex_geterror *geterror));
-
-
-
-
-/* --- MEMORY HANDLING --- */
-
-
-/* By default, the realloc function pointer is set to our internal
- realloc implementation which iself uses lt_dlmalloc and lt_dlfree.
- libltdl relies on a featureful realloc, but if you are sure yours
- has the right semantics then you can assign it directly. Generally,
- it is safe to assign just a malloc() and a free() function. */
-LT_SCOPE lt_ptr (*lt_dlmalloc) LT_PARAMS((size_t size));
-LT_SCOPE lt_ptr (*lt_dlrealloc) LT_PARAMS((lt_ptr ptr, size_t size));
-LT_SCOPE void (*lt_dlfree) LT_PARAMS((lt_ptr ptr));
-
-
-
-
-/* --- PRELOADED MODULE SUPPORT --- */
-
-
-/* A preopened symbol. Arrays of this type comprise the exported
- symbols for a dlpreopened module. */
-typedef struct {
- const char *name;
- lt_ptr address;
-} lt_dlsymlist;
-
-LT_SCOPE int lt_dlpreload LT_PARAMS((const lt_dlsymlist *preloaded));
-LT_SCOPE int lt_dlpreload_default
- LT_PARAMS((const lt_dlsymlist *preloaded));
-
-#define LTDL_SET_PRELOADED_SYMBOLS() LT_STMT_START{ \
- extern const lt_dlsymlist lt_preloaded_symbols[]; \
- lt_dlpreload_default(lt_preloaded_symbols); \
- }LT_STMT_END
-
-
-
-
-/* --- MODULE INFORMATION --- */
-
-
-/* Read only information pertaining to a loaded module. */
-typedef struct {
- char *filename; /* file name */
- char *name; /* module name */
- int ref_count; /* number of times lt_dlopened minus
- number of times lt_dlclosed. */
-} lt_dlinfo;
-
-LT_SCOPE const lt_dlinfo *lt_dlgetinfo LT_PARAMS((lt_dlhandle handle));
-LT_SCOPE lt_dlhandle lt_dlhandle_next LT_PARAMS((lt_dlhandle place));
-LT_SCOPE int lt_dlforeach LT_PARAMS((
- int (*func) (lt_dlhandle handle, lt_ptr data),
- lt_ptr data));
-
-/* Associating user data with loaded modules. */
-typedef unsigned lt_dlcaller_id;
-
-LT_SCOPE lt_dlcaller_id lt_dlcaller_register LT_PARAMS((void));
-LT_SCOPE lt_ptr lt_dlcaller_set_data LT_PARAMS((lt_dlcaller_id key,
- lt_dlhandle handle,
- lt_ptr data));
-LT_SCOPE lt_ptr lt_dlcaller_get_data LT_PARAMS((lt_dlcaller_id key,
- lt_dlhandle handle));
-
-
-
-/* --- USER MODULE LOADER API --- */
-
-
-typedef struct lt_dlloader lt_dlloader;
-typedef lt_ptr lt_user_data;
-typedef lt_ptr lt_module;
-
-/* Function pointer types for creating user defined module loaders. */
-typedef lt_module lt_module_open LT_PARAMS((lt_user_data loader_data,
- const char *filename));
-typedef int lt_module_close LT_PARAMS((lt_user_data loader_data,
- lt_module handle));
-typedef lt_ptr lt_find_sym LT_PARAMS((lt_user_data loader_data,
- lt_module handle,
- const char *symbol));
-typedef int lt_dlloader_exit LT_PARAMS((lt_user_data loader_data));
-
-struct lt_user_dlloader {
- const char *sym_prefix;
- lt_module_open *module_open;
- lt_module_close *module_close;
- lt_find_sym *find_sym;
- lt_dlloader_exit *dlloader_exit;
- lt_user_data dlloader_data;
-};
-
-LT_SCOPE lt_dlloader *lt_dlloader_next LT_PARAMS((lt_dlloader *place));
-LT_SCOPE lt_dlloader *lt_dlloader_find LT_PARAMS((
- const char *loader_name));
-LT_SCOPE const char *lt_dlloader_name LT_PARAMS((lt_dlloader *place));
-LT_SCOPE lt_user_data *lt_dlloader_data LT_PARAMS((lt_dlloader *place));
-LT_SCOPE int lt_dlloader_add LT_PARAMS((lt_dlloader *place,
- const struct lt_user_dlloader *dlloader,
- const char *loader_name));
-LT_SCOPE int lt_dlloader_remove LT_PARAMS((
- const char *loader_name));
-
-
-
-/* --- ERROR MESSAGE HANDLING --- */
-
-
-/* Defining error strings alongside their symbolic names in a macro in
- this way allows us to expand the macro in different contexts with
- confidence that the enumeration of symbolic names will map correctly
- onto the table of error strings. */
-#define lt_dlerror_table \
- LT_ERROR(UNKNOWN, "unknown error") \
- LT_ERROR(DLOPEN_NOT_SUPPORTED, "dlopen support not available") \
- LT_ERROR(INVALID_LOADER, "invalid loader") \
- LT_ERROR(INIT_LOADER, "loader initialization failed") \
- LT_ERROR(REMOVE_LOADER, "loader removal failed") \
- LT_ERROR(FILE_NOT_FOUND, "file not found") \
- LT_ERROR(DEPLIB_NOT_FOUND, "dependency library not found") \
- LT_ERROR(NO_SYMBOLS, "no symbols defined") \
- LT_ERROR(CANNOT_OPEN, "can't open the module") \
- LT_ERROR(CANNOT_CLOSE, "can't close the module") \
- LT_ERROR(SYMBOL_NOT_FOUND, "symbol not found") \
- LT_ERROR(NO_MEMORY, "not enough memory") \
- LT_ERROR(INVALID_HANDLE, "invalid module handle") \
- LT_ERROR(BUFFER_OVERFLOW, "internal buffer overflow") \
- LT_ERROR(INVALID_ERRORCODE, "invalid errorcode") \
- LT_ERROR(SHUTDOWN, "library already shutdown") \
- LT_ERROR(CLOSE_RESIDENT_MODULE, "can't close resident module") \
- LT_ERROR(INVALID_MUTEX_ARGS, "invalid mutex handler registration") \
- LT_ERROR(INVALID_POSITION, "invalid search path insert position")
-
-/* Enumerate the symbolic error names. */
-enum {
-#define LT_ERROR(name, diagnostic) LT_CONC(LT_ERROR_, name),
- lt_dlerror_table
-#undef LT_ERROR
-
- LT_ERROR_MAX
-};
-
-/* These functions are only useful from inside custom module loaders. */
-LT_SCOPE int lt_dladderror LT_PARAMS((const char *diagnostic));
-LT_SCOPE int lt_dlseterror LT_PARAMS((int errorcode));
-
-
-
-
-/* --- SOURCE COMPATIBILITY WITH OLD LIBLTDL --- */
-
-
-#ifdef LT_NON_POSIX_NAMESPACE
-# define lt_ptr_t lt_ptr
-# define lt_module_t lt_module
-# define lt_module_open_t lt_module_open
-# define lt_module_close_t lt_module_close
-# define lt_find_sym_t lt_find_sym
-# define lt_dlloader_exit_t lt_dlloader_exit
-# define lt_dlloader_t lt_dlloader
-# define lt_dlloader_data_t lt_user_data
-#endif
-
-LT_END_C_DECLS
-
-#endif /* !LTDL_H */
--
1.6.0.6
hercules-3.06-preproc.patch:
--- NEW FILE hercules-3.06-preproc.patch ---
>From d69fac19b155f76ceda9d97c5a57bec0aea41cd5 Mon Sep 17 00:00:00 2001
From: Dan Horak <dan at danny.cz>
Date: Wed, 18 Feb 2009 21:54:32 +0100
Subject: [PATCH] change #elif without condition into #else
---
hsccmd.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/hsccmd.c b/hsccmd.c
index 4cd15ab..2ebcb4b 100644
--- a/hsccmd.c
+++ b/hsccmd.c
@@ -7672,7 +7672,7 @@ void *panel_command (void *cmdline)
break;
}
}
-#elif // OPTION_CMDTGT
+#else // OPTION_CMDTGT
#ifdef _FEATURE_SYSTEM_CONSOLE
if ('.' == cmd[0] || '!' == cmd[0])
{
--
1.6.0.6
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/hercules/EL-5/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore 9 Oct 2008 18:14:00 -0000 1.6
+++ .cvsignore 19 Feb 2009 06:55:30 -0000 1.7
@@ -1 +1 @@
-hercules-3.05-20081009.tar.gz
+hercules-3.06.tar.gz
Index: hercules.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hercules/EL-5/hercules.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- hercules.spec 9 Oct 2008 18:14:00 -0000 1.15
+++ hercules.spec 19 Feb 2009 06:55:30 -0000 1.16
@@ -1,26 +1,21 @@
-%define cvsdate 20081009
-
Summary: Hercules S/370, ESA/390, and z/Architecture emulator
Name: hercules
-Version: 3.05
-Release: 7.%{cvsdate}cvs%{?dist}
+Version: 3.06
+Release: 1%{?dist}
License: QPL
Group: Applications/Emulators
URL: http://www.hercules-390.org/
-#Source0: http://www.hercules-390.org/hercules-%{version}.tar.gz
-# CVS snapshot; use commands below to reproduce
-# cvs -d :pserver:anonymous at cvs.hercules-390.org:/usr/cvs/hercules co -D %{cvsdate} hercules
-# cd hercules; sh ./autogen.sh && ./configure && make dist
-Source0: hercules-%{version}-%{cvsdate}.tar.gz
+Source0: http://www.hercules-390.org/hercules-%{version}.tar.gz
Source1: hercules.cnf
Source2: hercules-run
Source3: README-rpm
Source4: generic.prm
Patch0: %{name}-3.05-make.patch
+Patch1: %{name}-3.06-ltdl.patch
+Patch2: %{name}-3.06-preproc.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
BuildRequires: bison, zlib-devel, bzip2-devel
-BuildRequires: libtool
-Obsoletes: hercules-docs <= 3.01
+BuildRequires: libtool libtool-ltdl-devel
%description
Hercules is an emulator for the IBM System/370, ESA/390, and z/Architecture
@@ -34,10 +29,14 @@
%prep
%setup -q
%patch0 -p0
+%patch1 -p1
+%patch2 -p1
# refresh for recent libtool
rm autoconf/libtool.m4
libtoolize --copy --force
+
+# refresh buildsystem
aclocal -I m4 -I autoconf
autoheader
automake
@@ -100,6 +99,10 @@
%changelog
+* Wed Feb 18 2009 Dan Horak <dan[at]danny.cz> 3.06-1
+- update to upstream version 3.06
+- use system ltdl library
+
* Thu Oct 09 2008 Dan Horak <dan[at]danny.cz> 3.05-7.20081009cvs
- update to CVS snapshot 20081009 (#461044)
- install utils only as docs
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/hercules/EL-5/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources 9 Oct 2008 18:14:00 -0000 1.6
+++ sources 19 Feb 2009 06:55:30 -0000 1.7
@@ -1 +1 @@
-9c3719547c6e40160ff4cfb9a664fd05 hercules-3.05-20081009.tar.gz
+3a356b251e2b7fc49ac2b7244d12d50b hercules-3.06.tar.gz
- Previous message (by thread): rpms/hercules/F-9 hercules-3.06-ltdl.patch, NONE, 1.1 hercules-3.06-preproc.patch, NONE, 1.1 .cvsignore, 1.7, 1.8 hercules.spec, 1.22, 1.23 sources, 1.7, 1.8
- Next message (by thread): rpms/gnome-applets/devel gnome-applets-resizeable.patch,1.1,1.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list