jengelh/libHX
SHA256
1
0
Fork 0
forked from pool/libHX
Code Pull Requests Activity

OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libHX?expand=0&rev=8

Browse Source
This commit is contained in:
OBS User unknown 2009-04-01 19:56:24 +00:00 committed by Git OBS Bridge
parent 770158e9d1
commit 50494a340a
6 changed files with 30 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
baselibs.conf
View File

@ -1 +1 @@
libHX13
libHX18

3
libHX-1.23.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:04ca6b73191695ef6d777a84a8d9f64053bad506ac7d4f09d7c0619031110f03
size 280602

3
libHX-2.5.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:54de801da0b83148b95201613a5a031509bb1e7bbdb553ceef7e1bf371474f7d
size 772905

53
libHX-hmc-fixes.dif
View File

@ -1,53 +0,0 @@
Index: libHX-1.23/src/hmc.c
===================================================================
--- libHX-1.23.orig/src/hmc.c
+++ libHX-1.23/src/hmc.c
@@ -70,10 +70,14 @@ EXPORT_SYMBOL hmc_t *hmc_memasg(hmc_t **
CHECK_IDENT(ctx);
if (ctx->alloc < len) {
ctx = realloc(ctx, sizeof(struct memcont) + len);
+ if (ctx == NULL)
+ return NULL;
ctx->alloc = len;
}
} else {
ctx = malloc(sizeof(struct memcont) + len);
+ if (ctx == NULL)
+ return NULL;
ctx->id = HMC_IDENT;
ctx->alloc = len;
}
@@ -102,12 +106,14 @@ EXPORT_SYMBOL hmc_t *hmc_trunc(hmc_t **v
CHECK_IDENT(ctx);
if (len > ctx->alloc) {
ctx = realloc(ctx, sizeof(struct memcont) + len);
+ if (ctx == NULL)
+ return NULL;
ctx->alloc = len;
} else {
ctx->data[len] = '\0';
ctx->length = len;
}
- return ctx->data;
+ return *vp = ctx->data;
}
EXPORT_SYMBOL hmc_t *hmc_strcat(hmc_t **vp, const char *s)
@@ -125,6 +131,8 @@ EXPORT_SYMBOL hmc_t *hmc_memcat(hmc_t **
CHECK_IDENT(ctx);
if (nl > ctx->alloc) {
ctx = realloc(ctx, sizeof(struct memcont) + nl);
+ if (ctx == NULL)
+ return NULL;
ctx->alloc = nl;
}
if (ptr == NULL)
@@ -171,6 +179,8 @@ EXPORT_SYMBOL hmc_t *hmc_memins(hmc_t **
CHECK_IDENT(ctx);
if (ctx->alloc < nl) {
ctx = realloc(ctx, sizeof(struct memcont) + nl);
+ if (ctx == NULL)
+ return NULL;
ctx->alloc = nl;
}
if (ptr == NULL)

8
libHX.changes
View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Wed Feb 18 12:22:28 CET 2009 - mc@suse.de
- update to version 2.5
* a lot of new features and fixes
see /usr/share/doc/packages/libHX/changelog.txt for details
* move lib back to /usr/lib/
-------------------------------------------------------------------
Thu Jan 29 15:38:19 CET 2009 - crrodriguez@suse.de

33
libHX.spec
View File

@ -1,5 +1,5 @@
#
# spec file for package libHX (Version 1.23)
# spec file for package libHX (Version 2.5)
#
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@ -19,17 +19,17 @@
Name: libHX
%define lname libHX13
%define lname libHX18
BuildRequires: gcc-c++ libxml2-devel
Summary: General-purpose Library
Version: 1.23
Release: 4
Version: 2.5
Release: 1
License: LGPL v2.1 or later; LGPL v3 or later
Prefix: /usr
Group: System/Libraries
Source: %{name}-%{version}.tar.bz2
Patch1: libHX-hmc-fixes.dif
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%define debug_package_requires libHX13 = %{version}-%{release}
%define debug_package_requires libHX18 = %{version}-%{release}
Url: http://jengelh.medozas.de/projects/libHX/
%description
@ -59,7 +59,7 @@ Authors:
--------
Jan Engelhardt <jengelh [at] gmx de>
%package -n libHX13
%package -n libHX18
License: LGPL v2.1 or later; LGPL v3 or later
Summary: General-purpose Library
Group: System/Libraries
@ -127,11 +127,10 @@ Authors:
%prep
%setup -q -n %{name}-%{version}
%patch1 -p1
%build
./autogen.sh;
%configure --with-pic --libdir=/%_lib --with-pkgconfigdir=/%_libdir/pkgconfig/
%configure --with-pic --with-pkgconfigdir=/%_libdir/pkgconfig/
make %{?jobs:-j%jobs};
perl -i -pe 's/^shouldnotlink=yes/shouldnotlink=no/;' \
src/%{name}.la src/.libs/%{name}.lai;
@ -139,10 +138,9 @@ perl -i -pe 's/^shouldnotlink=yes/shouldnotlink=no/;' \
%install
make install DESTDIR=${RPM_BUILD_ROOT}
mkdir -p "${RPM_BUILD_ROOT}/%_docdir";
cp -a doc "${RPM_BUILD_ROOT}/%_docdir/%name";
rm -f ${RPM_BUILD_ROOT}/%_lib/%{name}.la
%{__ln_s} -v /%{_lib}/$(readlink %{buildroot}/%{_lib}/%{name}.so) %{buildroot}%{_libdir}/%{name}.so
%{__rm} -v %{buildroot}/%{_lib}/%{name}.so
cp -a doc "${RPM_BUILD_ROOT}/%{_defaultdocdir}/%{name}";
rm -f ${RPM_BUILD_ROOT}/%{_defaultdocdir}/%{name}/.gitignore
rm -f ${RPM_BUILD_ROOT}/%{_libdir}/%{name}.la
%clean
rm -rf $RPM_BUILD_ROOT
@ -153,17 +151,22 @@ rm -rf $RPM_BUILD_ROOT
%files -n %{lname}
%defattr(-, root, root)
/%_lib/%{name}*.so.*
/%_libdir/%{name}*.so.*
%files devel
%defattr(-, root, root)
%docdir %_docdir/%name
%_docdir/%name
%_includedir/%{name}*
%_libdir/%{name}*.so
/%{_libdir}/%{name}*.so
%_libdir/pkgconfig/*.pc
%changelog
* Wed Feb 18 2009 mc@suse.de
- update to version 2.5
* a lot of new features and fixes
see /usr/share/doc/packages/libHX/changelog.txt for details
* move lib back to /usr/lib/
* Thu Jan 29 2009 crrodriguez@suse.de
- move .so symlinks to %%{_libdir}
- fix -devel package dependencies