rpms/centericq/FC-3 centericq-4.21.0-kkstrtext.patch, NONE, 1.1 centericq-4.21.0.msn.patch, NONE, 1.1 centericq.spec, 1.9, 1.10
Andreas Bierfert (awjb)
fedora-extras-commits at redhat.com
Tue Jan 3 10:03:13 UTC 2006
- Previous message (by thread): rpms/rxvt-unicode/devel .cvsignore, 1.7, 1.8 rxvt-unicode.spec, 1.12, 1.13 sources, 1.7, 1.8
- Next message (by thread): rpms/centericq/FC-4 centericq-4.21.0-kkstrtext.patch, NONE, 1.1 centericq-4.21.0.msn.patch, NONE, 1.1 centericq.spec, 1.19, 1.20
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: awjb
Update of /cvs/extras/rpms/centericq/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10431/FC-3
Modified Files:
centericq.spec
Added Files:
centericq-4.21.0-kkstrtext.patch centericq-4.21.0.msn.patch
Log Message:
- fix more security suff
- fix libmsn
centericq-4.21.0-kkstrtext.patch:
--- NEW FILE centericq-4.21.0-kkstrtext.patch ---
--- centericq-4.21.0.orig/kkstrtext-0.1/kkstrtext.h 2004-11-17 23:00:38.000000000 +0000
+++ centericq-4.21.0/kkstrtext-0.1/kkstrtext.h 2005-12-13 18:34:56.308723728 +0000
@@ -87,7 +87,7 @@
{ \
va_list vgs__ap; char vgs__buf[1024]; \
va_start(vgs__ap, fmt); \
- vsprintf(vgs__buf, fmt, vgs__ap); c = vgs__buf; \
+ vsnprintf(vgs__buf, sizeof(vgs__buf), fmt, vgs__ap); c = vgs__buf; \
va_end(vgs__ap); \
}
centericq-4.21.0.msn.patch:
--- NEW FILE centericq-4.21.0.msn.patch ---
diff -NPrc centericq-4.21.0-org/aclocal.m4 centericq-4.21.0/aclocal.m4
*** centericq-4.21.0-org/aclocal.m4 2005-09-02 16:46:00.000000000 +0200
--- centericq-4.21.0/aclocal.m4 2005-11-07 16:43:58.000000000 +0100
***************
*** 1,1146 ****
! dnl aclocal.m4 generated automatically by aclocal 1.4-p6
! dnl Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
! dnl This file is free software; the Free Software Foundation
! dnl gives unlimited permission to copy and/or distribute it,
! dnl with or without modifications, as long as this notice is preserved.
!
! dnl This program is distributed in the hope that it will be useful,
! dnl but WITHOUT ANY WARRANTY, to the extent permitted by law; without
! dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A
! dnl PARTICULAR PURPOSE.
!
! # lib-prefix.m4 serial 4 (gettext-0.14.2)
! dnl Copyright (C) 2001-2005 Free Software Foundation, Inc.
! dnl This file is free software; the Free Software Foundation
! dnl gives unlimited permission to copy and/or distribute it,
! dnl with or without modifications, as long as this notice is preserved.
! dnl From Bruno Haible.
! dnl AC_LIB_ARG_WITH is synonymous to AC_ARG_WITH in autoconf-2.13, and
! dnl similar to AC_ARG_WITH in autoconf 2.52...2.57 except that is doesn't
! dnl require excessive bracketing.
! ifdef([AC_HELP_STRING],
! [AC_DEFUN([AC_LIB_ARG_WITH], [AC_ARG_WITH([$1],[[$2]],[$3],[$4])])],
! [AC_DEFUN([AC_][LIB_ARG_WITH], [AC_ARG_WITH([$1],[$2],[$3],[$4])])])
! dnl AC_LIB_PREFIX adds to the CPPFLAGS and LDFLAGS the flags that are needed
! dnl to access previously installed libraries. The basic assumption is that
! dnl a user will want packages to use other packages he previously installed
! dnl with the same --prefix option.
! dnl This macro is not needed if only AC_LIB_LINKFLAGS is used to locate
! dnl libraries, but is otherwise very convenient.
! AC_DEFUN([AC_LIB_PREFIX],
! [
! AC_BEFORE([$0], [AC_LIB_LINKFLAGS])
! AC_REQUIRE([AC_PROG_CC])
! AC_REQUIRE([AC_CANONICAL_HOST])
! AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
! dnl By default, look in $includedir and $libdir.
! use_additional=yes
! AC_LIB_WITH_FINAL_PREFIX([
! eval additional_includedir=\"$includedir\"
! eval additional_libdir=\"$libdir\"
! ])
! AC_LIB_ARG_WITH([lib-prefix],
! [ --with-lib-prefix[=DIR] search for libraries in DIR/include and DIR/lib
! --without-lib-prefix don't search for libraries in includedir and libdir],
! [
! if test "X$withval" = "Xno"; then
! use_additional=no
! else
! if test "X$withval" = "X"; then
! AC_LIB_WITH_FINAL_PREFIX([
! eval additional_includedir=\"$includedir\"
! eval additional_libdir=\"$libdir\"
! ])
! else
! additional_includedir="$withval/include"
! additional_libdir="$withval/lib"
! fi
! fi
! ])
! if test $use_additional = yes; then
! dnl Potentially add $additional_includedir to $CPPFLAGS.
! dnl But don't add it
! dnl 1. if it's the standard /usr/include,
! dnl 2. if it's already present in $CPPFLAGS,
! dnl 3. if it's /usr/local/include and we are using GCC on Linux,
! dnl 4. if it doesn't exist as a directory.
! if test "X$additional_includedir" != "X/usr/include"; then
! haveit=
! for x in $CPPFLAGS; do
! AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
! if test "X$x" = "X-I$additional_includedir"; then
! haveit=yes
! break
! fi
! done
! if test -z "$haveit"; then
! if test "X$additional_includedir" = "X/usr/local/include"; then
! if test -n "$GCC"; then
! case $host_os in
! linux* | gnu* | k*bsd*-gnu) haveit=yes;;
! esac
! fi
! fi
! if test -z "$haveit"; then
! if test -d "$additional_includedir"; then
! dnl Really add $additional_includedir to $CPPFLAGS.
! CPPFLAGS="${CPPFLAGS}${CPPFLAGS:+ }-I$additional_includedir"
! fi
! fi
! fi
! fi
! dnl Potentially add $additional_libdir to $LDFLAGS.
! dnl But don't add it
! dnl 1. if it's the standard /usr/lib,
! dnl 2. if it's already present in $LDFLAGS,
! dnl 3. if it's /usr/local/lib and we are using GCC on Linux,
! dnl 4. if it doesn't exist as a directory.
! if test "X$additional_libdir" != "X/usr/lib"; then
! haveit=
! for x in $LDFLAGS; do
! AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
! if test "X$x" = "X-L$additional_libdir"; then
! haveit=yes
! break
! fi
! done
! if test -z "$haveit"; then
! if test "X$additional_libdir" = "X/usr/local/lib"; then
! if test -n "$GCC"; then
! case $host_os in
! linux*) haveit=yes;;
! esac
! fi
! fi
! if test -z "$haveit"; then
! if test -d "$additional_libdir"; then
! dnl Really add $additional_libdir to $LDFLAGS.
! LDFLAGS="${LDFLAGS}${LDFLAGS:+ }-L$additional_libdir"
! fi
! fi
! fi
! fi
! fi
! ])
! dnl AC_LIB_PREPARE_PREFIX creates variables acl_final_prefix,
! dnl acl_final_exec_prefix, containing the values to which $prefix and
! dnl $exec_prefix will expand at the end of the configure script.
! AC_DEFUN([AC_LIB_PREPARE_PREFIX],
[
! dnl Unfortunately, prefix and exec_prefix get only finally determined
! dnl at the end of configure.
! if test "X$prefix" = "XNONE"; then
! acl_final_prefix="$ac_default_prefix"
! else
! acl_final_prefix="$prefix"
! fi
! if test "X$exec_prefix" = "XNONE"; then
! acl_final_exec_prefix='${prefix}'
! else
! acl_final_exec_prefix="$exec_prefix"
fi
- acl_save_prefix="$prefix"
- prefix="$acl_final_prefix"
- eval acl_final_exec_prefix=\"$acl_final_exec_prefix\"
- prefix="$acl_save_prefix"
- ])
-
- dnl AC_LIB_WITH_FINAL_PREFIX([statement]) evaluates statement, with the
- dnl variables prefix and exec_prefix bound to the values they will have
- dnl at the end of the configure script.
- AC_DEFUN([AC_LIB_WITH_FINAL_PREFIX],
- [
- acl_save_prefix="$prefix"
- prefix="$acl_final_prefix"
- acl_save_exec_prefix="$exec_prefix"
- exec_prefix="$acl_final_exec_prefix"
- $1
- exec_prefix="$acl_save_exec_prefix"
- prefix="$acl_save_prefix"
])
! # lib-link.m4 serial 6 (gettext-0.14.3)
! dnl Copyright (C) 2001-2005 Free Software Foundation, Inc.
! dnl This file is free software; the Free Software Foundation
! dnl gives unlimited permission to copy and/or distribute it,
! dnl with or without modifications, as long as this notice is preserved.
! dnl From Bruno Haible.
! AC_PREREQ(2.50)
! dnl AC_LIB_LINKFLAGS(name [, dependencies]) searches for libname and
! dnl the libraries corresponding to explicit and implicit dependencies.
! dnl Sets and AC_SUBSTs the LIB${NAME} and LTLIB${NAME} variables and
! dnl augments the CPPFLAGS variable.
! AC_DEFUN([AC_LIB_LINKFLAGS],
[
! AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
! AC_REQUIRE([AC_LIB_RPATH])
! define([Name],[translit([$1],[./-], [___])])
! define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
! [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
! AC_CACHE_CHECK([how to link with lib[]$1], [ac_cv_lib[]Name[]_libs], [
! AC_LIB_LINKFLAGS_BODY([$1], [$2])
! ac_cv_lib[]Name[]_libs="$LIB[]NAME"
! ac_cv_lib[]Name[]_ltlibs="$LTLIB[]NAME"
! ac_cv_lib[]Name[]_cppflags="$INC[]NAME"
])
- LIB[]NAME="$ac_cv_lib[]Name[]_libs"
[...78903 lines suppressed...]
! TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
! $(TAGS_FILES) $(LISP)
tags=; \
here=`pwd`; \
+ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
+ include_option=--etags-include; \
+ empty_fix=.; \
+ else \
+ include_option=--include; \
+ empty_fix=; \
+ fi; \
list='$(SUBDIRS)'; for subdir in $$list; do \
! if test "$$subdir" = .; then :; else \
! test ! -f $$subdir/TAGS || \
! tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
! fi; \
done; \
! list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
! unique=`for i in $$list; do \
! if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
! done | \
! $(AWK) ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
! if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
! test -n "$$unique" || unique=$$empty_fix; \
! $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
! $$tags $$unique; \
! fi
! ctags: CTAGS
! CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
! $(TAGS_FILES) $(LISP)
! tags=; \
! here=`pwd`; \
! list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
! unique=`for i in $$list; do \
! if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
! done | \
! $(AWK) ' { files[$$0] = 1; } \
! END { for (i in files) print i; }'`; \
! test -z "$(CTAGS_ARGS)$$tags$$unique" \
! || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
! $$tags $$unique
!
! GTAGS:
! here=`$(am__cd) $(top_builddir) && pwd` \
! && cd $(top_srcdir) \
! && gtags -i $(GTAGS_ARGS) $$here
distclean-tags:
! -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
distdir: $(DISTFILES)
! @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
! topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
! list='$(DISTFILES)'; for file in $$list; do \
! case $$file in \
! $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
! $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
! esac; \
! if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
! dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
! if test "$$dir" != "$$file" && test "$$dir" != "."; then \
! dir="/$$dir"; \
! $(mkdir_p) "$(distdir)$$dir"; \
! else \
! dir=''; \
! fi; \
if test -d $$d/$$file; then \
! if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
! cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
! fi; \
! cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
else \
test -f $(distdir)/$$file \
! || cp -p $$d/$$file $(distdir)/$$file \
! || exit 1; \
fi; \
done
! list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
if test "$$subdir" = .; then :; else \
! test -d "$(distdir)/$$subdir" \
! || $(mkdir_p) "$(distdir)/$$subdir" \
|| exit 1; \
! distdir=`$(am__cd) $(distdir) && pwd`; \
! top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
! (cd $$subdir && \
! $(MAKE) $(AM_MAKEFLAGS) \
! top_distdir="$$top_distdir" \
! distdir="$$distdir/$$subdir" \
! distdir) \
|| exit 1; \
fi; \
done
check-am: all-am
check: check-recursive
! all-am: Makefile $(PROGRAMS)
! installdirs: installdirs-recursive
! installdirs-am:
! for dir in "$(DESTDIR)$(bindir)"; do \
! test -z "$$dir" || $(mkdir_p) "$$dir"; \
! done
! install: install-recursive
install-exec: install-exec-recursive
install-data: install-data-recursive
+ uninstall: uninstall-recursive
install-am: all-am
@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+ installcheck: installcheck-recursive
+ install-strip:
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ `test -z '$(STRIP)' || \
+ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
mostlyclean-generic:
clean-generic:
distclean-generic:
! -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
maintainer-clean-generic:
! @echo "This command is intended for maintainers to use"
! @echo "it deletes files that may require special tools to rebuild."
! clean: clean-recursive
! clean-am: clean-binPROGRAMS clean-generic mostlyclean-am
! distclean: distclean-recursive
! -rm -rf ./$(DEPDIR)
! -rm -f Makefile
! distclean-am: clean-am distclean-compile distclean-generic \
! distclean-tags
! dvi: dvi-recursive
!
! dvi-am:
! html: html-recursive
! info: info-recursive
! info-am:
!
! install-data-am:
!
! install-exec-am: install-binPROGRAMS
!
! install-info: install-info-recursive
!
! install-man:
!
! installcheck-am:
maintainer-clean: maintainer-clean-recursive
+ -rm -rf ./$(DEPDIR)
+ -rm -f Makefile
+ maintainer-clean-am: distclean-am maintainer-clean-generic
+
+ mostlyclean: mostlyclean-recursive
+
+ mostlyclean-am: mostlyclean-compile mostlyclean-generic
+
+ pdf: pdf-recursive
+
+ pdf-am:
+
+ ps: ps-recursive
+
+ ps-am:
+
+ uninstall-am: uninstall-binPROGRAMS uninstall-info-am
! uninstall-info: uninstall-info-recursive
+ .PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
+ clean clean-binPROGRAMS clean-generic clean-recursive ctags \
+ ctags-recursive distclean distclean-compile distclean-generic \
+ distclean-recursive distclean-tags distdir dvi dvi-am html \
+ html-am info info-am install install-am install-binPROGRAMS \
+ install-data install-data-am install-exec install-exec-am \
+ install-info install-info-am install-man install-strip \
+ installcheck installcheck-am installdirs installdirs-am \
+ maintainer-clean maintainer-clean-generic \
+ maintainer-clean-recursive mostlyclean mostlyclean-compile \
+ mostlyclean-generic mostlyclean-recursive pdf pdf-am ps ps-am \
+ tags tags-recursive uninstall uninstall-am \
+ uninstall-binPROGRAMS uninstall-info-am
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
diff -NPrc centericq-4.21.0-org/stamp-h.in centericq-4.21.0/stamp-h.in
*** centericq-4.21.0-org/stamp-h.in 2005-09-02 16:46:28.000000000 +0200
--- centericq-4.21.0/stamp-h.in 1970-01-01 01:00:00.000000000 +0100
***************
*** 1 ****
- timestamp
--- 0 ----
Index: centericq.spec
===================================================================
RCS file: /cvs/extras/rpms/centericq/FC-3/centericq.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- centericq.spec 30 Nov 2005 21:19:20 -0000 1.9
+++ centericq.spec 3 Jan 2006 10:02:58 -0000 1.10
@@ -1,6 +1,6 @@
Name: centericq
Version: 4.21.0
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Text mode menu- and window-driven IM
@@ -17,6 +17,11 @@
# see redhat bugzilla #174611
Patch4: centericq-4.21.0-icq-short-read.diff.bz2
Patch5: centericq-4.21.0-memory-handling.diff.bz2
+# and see http://www.gentoo.org/security/en/glsa/glsa-200512-11.xml
+# and redhat bugzilla #176451
+Patch6: centericq-4.21.0-kkstrtext.patch
+# Fix libmsn
+Patch100: http://centericq.de/archive/contrib/patches/centericq-4.21.0.msn.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
BuildRequires: krb5-devel
@@ -38,6 +43,8 @@
%patch3
%patch4 -p1
%patch5 -p1
+%patch6 -p1
+%patch100 -p1
%build
CFLAGS="$RPM_OPT_FLAGS" \
@@ -65,8 +72,14 @@
%dir %{_datadir}/%{name}
%{_datadir}/%{name}/*
%{_mandir}/man1/*
-
+# we don't want that
+%exclude %{_includedir}/msn
%changelog
+* Tue Jan 03 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+4.21.0-3
+- Fix more security related stuff
+- Fix libmsn
+
* Wed Nov 30 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
4.21.0-2
- fix CVE-2005-3694 see (#174611)
- Previous message (by thread): rpms/rxvt-unicode/devel .cvsignore, 1.7, 1.8 rxvt-unicode.spec, 1.12, 1.13 sources, 1.7, 1.8
- Next message (by thread): rpms/centericq/FC-4 centericq-4.21.0-kkstrtext.patch, NONE, 1.1 centericq-4.21.0.msn.patch, NONE, 1.1 centericq.spec, 1.19, 1.20
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list