Hello community,
here is the log from the commit of package canna for openSUSE:Factory
checked in at Mon Dec 21 23:38:32 CET 2009.
--------
--- canna/canna.changes 2009-11-03 20:16:17.000000000 +0100
+++ canna/canna.changes 2009-12-09 15:37:33.000000000 +0100
@@ -1,0 +2,5 @@
+Wed Dec 9 15:31:13 CET 2009 - meissner@suse.de
+
+- added some unistd.h includes
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
New:
----
canna-fiximplicit.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ canna.spec ++++++
--- /var/tmp/diff_new_pack.GpqVUl/_old 2009-12-21 23:38:05.000000000 +0100
+++ /var/tmp/diff_new_pack.GpqVUl/_new 2009-12-21 23:38:05.000000000 +0100
@@ -20,7 +20,7 @@
Name: canna
BuildRequires: ncurses-devel pwdutils termcap xorg-x11-devel
-License: BSD 3-clause (or similar)
+License: BSD3c(or similar)
Group: System/I18n/Japanese
PreReq: /usr/sbin/useradd /bin/rm %insserv_prereq %fillup_prereq
#BuildPrereq: termcap
@@ -28,7 +28,7 @@
AutoReqProv: on
Provides: locale(ja)
Version: 3.7p3
-Release: 203
+Release: 204
# http://canna.sourceforge.jp/
Url: http://www.nec.co.jp/japanese/product/computer/soft/canna/
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -58,6 +58,7 @@
Patch23: canna-strip.patch
Patch24: bug-262623-internet-usage-broken-by-security-patch.patch
Patch25: Canna37p3-destbufferoverflow.patch
+Patch26: canna-fiximplicit.patch
# Summary(ja): Canna - かな漢字変換システム
# %description -n canna -l ja
# UNIX 上で共通に使える日本語入力システムとして Wnn が存在しました。
@@ -97,7 +98,7 @@
Osamu Hata
%package -n canna-libs
-License: BSD 3-clause (or similar)
+License: BSD3c(or similar)
Summary: Canna Libraries
Group: System/I18n/Japanese
Provides: canna:/usr/lib/libcanna.so.1.1
@@ -115,7 +116,7 @@
Osamu Hata
%package -n canna-devel
-License: BSD 3-clause (or similar)
+License: BSD3c(or similar)
Summary: Libraries of Canna
Group: Development/Libraries/C and C++
Requires: %{name} = %{version}, %{name}-libs = %{version}
@@ -156,6 +157,7 @@
%patch23
%patch24 -p1
%patch25
+%patch26 -p1
%build
%{suse_update_config -f canuum}
++++++ Canna37p3-destbufferoverflow.patch ++++++
--- /var/tmp/diff_new_pack.GpqVUl/_old 2009-12-21 23:38:05.000000000 +0100
+++ /var/tmp/diff_new_pack.GpqVUl/_new 2009-12-21 23:38:05.000000000 +0100
@@ -1,7 +1,7 @@
Index: cmd/catdic/rutil.c
===================================================================
---- cmd/catdic/rutil.c.orig 2008-10-08 21:04:49.000000000 +0200
-+++ cmd/catdic/rutil.c 2008-10-08 21:06:42.000000000 +0200
+--- cmd/catdic/rutil.c.orig
++++ cmd/catdic/rutil.c
@@ -24,7 +24,7 @@
* rutil.c
*/
++++++ canna-fiximplicit.patch ++++++
Index: Canna37p3/canuum/jhlp.c
===================================================================
--- Canna37p3.orig/canuum/jhlp.c
+++ Canna37p3/canuum/jhlp.c
@@ -41,6 +41,7 @@ static char *rcs_id = "jhlp.c,v 1.13 200
#include
#include
#include
+#include
#if STDC_HEADERS
# include
# include
Index: Canna37p3/cmd/catdic/can.c
===================================================================
--- Canna37p3.orig/cmd/catdic/can.c
+++ Canna37p3/cmd/catdic/can.c
@@ -32,6 +32,7 @@ static char rcs[] = "@(#) 112.1 $Id: can
#include
#include
+#include
#include
#include
#include
Index: Canna37p3/cmd/catdic/rutil.c
===================================================================
--- Canna37p3.orig/cmd/catdic/rutil.c
+++ Canna37p3/cmd/catdic/rutil.c
@@ -32,6 +32,7 @@ static const char rcs[] = "@(#) 112.1 $I
#endif
#include
+#include
#define CANNA_NEW_WCHAR_AWARE
#include
Index: Canna37p3/server/misc.c
===================================================================
--- Canna37p3.orig/server/misc.c
+++ Canna37p3/server/misc.c
@@ -40,6 +40,9 @@ static char rcs_id[]="@(#) $Id: misc.c,v
#include
#include
+#define __USE_BSD
+#include
+
#define ERRFILE "CANNA"
#define ERRFILE2 "msgs"
#define ERRSIZE 64
++++++ security-okir.patch ++++++
--- /var/tmp/diff_new_pack.GpqVUl/_old 2009-12-21 23:38:05.000000000 +0100
+++ /var/tmp/diff_new_pack.GpqVUl/_new 2009-12-21 23:38:05.000000000 +0100
@@ -1,6 +1,8 @@
---- Canna37p3/Imakefile
+Index: Canna37p3/Imakefile
+===================================================================
+--- Canna37p3.orig/Imakefile
+++ Canna37p3/Imakefile
-@@ -49,7 +49,9 @@
+@@ -49,7 +49,9 @@ cannaconf.h: Canna.conf
@echo "#endif" >> junkjunk
@echo "/* for cannaserver */" >> junkjunk
@echo "#define DICHOME '$(DicDir)'" >> junkjunk
@@ -10,7 +12,7 @@
@echo "#define USE_INET_SOCKET" >> junkjunk
@echo "#define ACCESS_FILE '$(AccessFile)'" >> junkjunk
@echo "/* for lib/RKC */" >> junkjunk
-@@ -77,7 +79,9 @@
+@@ -77,7 +79,9 @@ cannaconf.h: Canna.conf
echo "#endif"; \
echo "/* for cannaserver */"; \
echo "#define DICHOME \"$(DicDir)\""; \
@@ -20,9 +22,11 @@
echo "#define USE_UNIX_SOCKET"; \
echo "#define USE_INET_SOCKET"; \
echo "#define IR_UNIX_DIR \"$(UnixSockDir)\""; \
---- Canna37p3/lib/RK/dd.c
+Index: Canna37p3/lib/RK/dd.c
+===================================================================
+--- Canna37p3.orig/lib/RK/dd.c
+++ Canna37p3/lib/RK/dd.c
-@@ -522,6 +522,12 @@
+@@ -522,6 +522,12 @@ _RkReadDD(name)
}
#endif
@@ -35,9 +39,11 @@
/* create dd even if there is no directory or dics.dir file */
(void)strcpy(path, sx->ddhome);
(void)strcat(path, "/");
---- Canna37p3/misc/Imakefile
+Index: Canna37p3/misc/Imakefile
+===================================================================
+--- Canna37p3.orig/misc/Imakefile
+++ Canna37p3/misc/Imakefile
-@@ -41,6 +41,7 @@
+@@ -41,6 +41,7 @@ rc.canna: rc.canna-dist $(CANNAROOT)/Can
-e 's%@(UnixSockDir)%$(UnixSockDir)%g' \@@\
-e 's%@(UnixSockName)%$(UnixSockName)%g' \@@\
-e 's%@(cannaOwner)%$(cannaOwner)%g' \@@\
@@ -45,7 +51,9 @@
-e 's%@(ErrDir)%$(ErrDir)%g' rc.canna-dist > $@
MakeSubdirs($(SUBDIRS))
---- Canna37p3/server/IR.h
+Index: Canna37p3/server/IR.h
+===================================================================
+--- Canna37p3.orig/server/IR.h
+++ Canna37p3/server/IR.h
@@ -25,11 +25,11 @@
@@ -60,9 +68,11 @@
#ifdef HAVE_TIME_H
# include
#endif
---- Canna37p3/server/comm.c
+Index: Canna37p3/server/comm.c
+===================================================================
+--- Canna37p3.orig/server/comm.c
+++ Canna37p3/server/comm.c
-@@ -555,7 +555,7 @@
+@@ -555,7 +555,7 @@ struct sockaddr_un *unaddr;
unaddr->sun_family = AF_UNIX;
oldUmask = umask (0);
@@ -71,9 +81,11 @@
errno != EEXIST ) {
ir_debug( Dmsg(5, "Can't open %s error No. %d\n",IR_UNIX_DIR, errno));
}
---- Canna37p3/server/main.c
+Index: Canna37p3/server/main.c
+===================================================================
+--- Canna37p3.orig/server/main.c
+++ Canna37p3/server/main.c
-@@ -43,7 +43,6 @@
+@@ -43,7 +43,6 @@ char *argv[] ;
SockHolder *sock_holder = NULL;
int status;
@@ -81,7 +93,7 @@
if (!(global_user_table = UserTable_new())
|| !(global_event_mgr = EventMgr_new()))
goto genfail;
-@@ -52,6 +51,12 @@
+@@ -52,6 +51,12 @@ char *argv[] ;
goto fail;
if (SockHolder_tie(sock_holder, global_event_mgr))
goto genfail;
@@ -94,9 +106,11 @@
/* �����Ф�ҥץ�����(�ǡ����)�Ȥ��Ƶ�ư���� */
parentid = BecomeDaemon();
---- Canna37p3/server/misc.c
+Index: Canna37p3/server/misc.c
+===================================================================
+--- Canna37p3.orig/server/misc.c
+++ Canna37p3/server/misc.c
-@@ -31,26 +31,13 @@
+@@ -31,26 +31,14 @@ static char rcs_id[]="@(#) $Id: misc.c,v
# include
#endif
@@ -111,6 +125,7 @@
#include
#include
#include
++#include
#include
-
-#ifndef DICHOME
@@ -124,7 +139,7 @@
#define ERRFILE "CANNA"
#define ERRFILE2 "msgs"
-@@ -72,10 +59,11 @@
+@@ -72,10 +60,11 @@ static int DebugMode = 0;
static int LogLevel = 0;
#endif
static int Syslog = 0; /* syslog ���̤����ɤ����Υե饰 */
@@ -137,7 +152,7 @@
static char *userID=NULL; /* canna server's user id */
-@@ -124,73 +112,96 @@
+@@ -124,73 +113,96 @@ EarlyInit ( argc, argv )
int argc;
char *argv[];
{
@@ -150,19 +165,19 @@
struct passwd *pwent;
- strcpy( Name, argv[ 0 ] );
-+ /* Sorry, usually my patches are a lot less intrusive, but this
-+ * code was such a mess I had to take the axe to it. --okir */
-+ ProgramName = argv[0];
-+ if ((sp = strrchr(ProgramName, '/')) != 0)
-+ ProgramName = sp + 1;
-
+-
- for( i = 1; i < argc; i++ ) {
- if( argv[i][0] == '/' ) {
- ddname = malloc(strlen(argv[i]) + 1);
- if( ddname )
- strcpy( (char *)ddname, argv[ i ] );
- }
--
++ /* Sorry, usually my patches are a lot less intrusive, but this
++ * code was such a mess I had to take the axe to it. --okir */
++ ProgramName = argv[0];
++ if ((sp = strrchr(ProgramName, '/')) != 0)
++ ProgramName = sp + 1;
+
- if( !strcmp( argv[i], "-p") ) {
- if (++i < argc) {
- PortNumberPlus = atoi( argv[i] ) ;
@@ -287,7 +302,7 @@
/* TCP/IP �����å������Ѳ�ǽ�Ǥʤ����Ͻ�λ���� */
if (gethostname( buf, MAXDATA ) != 0) {
fprintf(stderr,"TCP/IP stack is not working\n") ;
-@@ -198,75 +209,21 @@
+@@ -198,75 +210,21 @@ char *argv[];
}
#endif
@@ -372,7 +387,7 @@
if (gethostname( buf, MAXDATA ) == 0) {
MyName = malloc(strlen(buf) + 1);
if (MyName) {
-@@ -276,9 +233,48 @@
+@@ -276,9 +234,48 @@ char *argv[];
ir_debug( Dmsg(5, "My name is %s\n", MyName ); )
@@ -422,7 +437,7 @@
}
static void
-@@ -341,10 +337,9 @@
+@@ -341,10 +338,9 @@ CloseServer()
}
/* ������˼��Ԥ������˸Ƥ֡�EventMgr_run()�ޤ��褿��ƤФʤ����ȡ� */
static void
@@ -435,7 +450,7 @@
CloseServer();
exit(2);
/*NOTREACHED*/
-@@ -805,6 +800,16 @@
+@@ -805,6 +801,16 @@ CreateAccessControlList()
fclose( fp ) ;
return 0;
@@ -452,7 +467,7 @@
}
static void
-@@ -986,15 +991,19 @@
+@@ -986,15 +992,19 @@ DetachTTY()
#endif
/* ɸ�२�顼���Ϥ顼�ե�������ڤ��ؤ��ơ�ɸ�������Ϥ��������� */
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org