sinjuginas/rpm-build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

4.0.4-alt95.M41.24

Browse Source 
- Backported changes by Dmitry V. Levin:
- rpmio/macro.c (doShellEscape): Fixed potential buffer underflow (closes: #11921).
- python: Fixed build with libtool.
This commit is contained in:
Alexey Tourbin 2009-09-24 11:57:44 +04:00
commit dbf90d4a21
3 changed files with 12 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/header_internal.c
View File

@ -21,7 +21,7 @@ char ** headerGetLangs(Header h)
if ((table = (char **)xcalloc((count+1), sizeof(char *))) == NULL) if ((table = (char **)xcalloc((count+1), sizeof(char *))) == NULL)
return NULL; return NULL;
for (i = 0, e = *s; i < count > 0; i++, e += strlen(e)+1) for (i = 0, e = *s; i < count; i++, e += strlen(e)+1)
table[i] = e; table[i] = e;
table[count] = NULL; table[count] = NULL;

24
python/Makefile.am
View File

@ -19,27 +19,13 @@ mylibs= \
LDADD = LDADD =
pythondir = $(libdir)/python${PYVER}/site-packages pythondir = $(libdir)/python${PYVER}/site-packages
python_PROGRAMS = rpmmodule.so python_LTLIBRARIES = rpmmodule.la
noinst_PROGRAMS = poptmodule.so rpmmodule_la_LDFLAGS = -module -avoid-version
rpmmodule_la_LIBADD = $(mylibs) $(LIBS) -lpython${PYVER}
rpmmodule_so_SOURCES = rpmmodule_la_SOURCES = rpmmodule.c hash.c upgrade.c header-py.c db-py.c
rpmmodule_so_CFLAGS = -fPIC -DPIC
rpmmodule_so_LDFLAGS = $(mylibs) $(LIBS) -lpython${PYVER} -shared -Wl,-soname,rpmmodule.so
poptmodule_so_SOURCES = poptmodule.c
poptmodule_so_CFLAGS = -fPIC -DPIC
poptmodule_so_LDFLAGS = $(mylibs) $(LIBS) -shared -Wl,-soname,poptmodule.so
noinst_LTLIBRARIES = librpmmodule.la
librpmmodule_la_SOURCES = rpmmodule.c hash.c upgrade.c header-py.c db-py.c
rpmmodule.so: $(librpmmodule_la_OBJECTS)
$(LINK) -o $@ $(librpmmodule_la_OBJECTS) $(rpmmodule_so_LDFLAGS)
poptmodule.so: $(poptmodule_so_OBJECTS)
$(LINK) -o $@ $(poptmodule_so_OBJECTS) $(poptmodule_so_LDFLAGS)
.PHONY: lclint .PHONY: lclint
lclint: lclint:
lclint $(DEFS) $(INCLUDES) $(librpmmodule_la_SOURCES) lclint $(DEFS) $(INCLUDES) $(rpmmodule_la_SOURCES)

7
rpm-4_0.spec
View File

@ -4,7 +4,7 @@
Name: %rpm_name Name: %rpm_name
Version: %rpm_version Version: %rpm_version
Release: alt95.M41.23 Release: alt95.M41.24
%define ifdef() %if %{expand:%%{?%{1}:1}%%{!?%{1}:0}} %define ifdef() %if %{expand:%%{?%{1}:1}%%{!?%{1}:0}}
%define get_dep() %(rpm -q --qf '%%{NAME} >= %%|SERIAL?{%%{SERIAL}:}|%%{VERSION}-%%{RELEASE}' %1 2>/dev/null || echo '%1 >= unknown') %define get_dep() %(rpm -q --qf '%%{NAME} >= %%|SERIAL?{%%{SERIAL}:}|%%{VERSION}-%%{RELEASE}' %1 2>/dev/null || echo '%1 >= unknown')
@ -528,6 +528,11 @@ fi
%endif #with contrib %endif #with contrib
%changelog %changelog
* Thu Sep 24 2009 Alexey Tourbin <at@altlinux.ru> 4.0.4-alt95.M41.24
- Backported changes by Dmitry V. Levin:
- rpmio/macro.c (doShellEscape): Fixed potential buffer underflow (closes: #11921).
- python: Fixed build with libtool.
* Wed Jul 01 2009 Alexey Tourbin <at@altlinux.ru> 4.0.4-alt95.M41.23 * Wed Jul 01 2009 Alexey Tourbin <at@altlinux.ru> 4.0.4-alt95.M41.23
- find-package: Removed contents_index_all search, enabled file-level dependencies. - find-package: Removed contents_index_all search, enabled file-level dependencies.