Author: pawelz Date: Thu Sep 4 12:47:37 2008 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- updated
---- Files affected:
SOURCES:
snownews-home_etc.patch (1.1 -> 1.2)
---- Diffs:
================================================================
Index: SOURCES/snownews-home_etc.patch
diff -u SOURCES/snownews-home_etc.patch:1.1 SOURCES/snownews-home_etc.patch:1.2
--- SOURCES/snownews-home_etc.patch:1.1 Sat Dec 23 21:26:30 2006
+++ SOURCES/snownews-home_etc.patch Thu Sep 4 14:47:31 2008
@@ -1,7 +1,29 @@
-diff -u -r -N --from-file=snownews-1.5.7.original/
snownews-1.5.7.original/cookies.c snownews-1.5.7/cookies.c
---- snownews-1.5.7.original/cookies.c 2005-06-05 11:50:22.000000000 +0200
-+++ snownews-1.5.7/cookies.c 2005-09-03 21:46:12.000000000 +0200
-@@ -37,6 +37,7 @@
+diff -Naur snownews-1.5.10.original/Makefile snownews-1.5.10/Makefile
+--- snownews-1.5.10.original/Makefile 2008-09-04 11:40:58.000000000 +0200
++++ snownews-1.5.10/Makefile 2008-09-04 11:42:12.000000000 +0200
+@@ -10,15 +10,15 @@
+ include platform_settings
+
+ ### Object files ###
+-OBJFILES= main.o netio.o interface.o xmlparse.o updatecheck.o conversions.o
dialog.o ui-support.o categories.o about.o cookies.o setup.o net-support.o
digcalc.o md5.o filters.o io-internal.o os-support.o zlib_interface.o support.o
++OBJFILES= main.o netio.o interface.o xmlparse.o updatecheck.o conversions.o
dialog.o ui-support.o categories.o about.o cookies.o setup.o net-support.o
digcalc.o md5.o filters.o io-internal.o os-support.o zlib_interface.o support.o
etc_path.o
+
+ VERSION= `grep VERSION version.h | sed s/\"//g | sed s/\#define\ VERSION\ //`
+ DISTDIR= snownews-$(VERSION)
+ DISTFILES = AUTHOR COPYING CREDITS Changelog README README.de README.patching
INSTALL opml2snow \
+ Makefile configure \
+ doc po scripts \
+- main.c interface.c netio.c xmlparse.c updatecheck.c os-support.c
conversions.c dialog.c ui-support.c categories.c about.c cookies.c setup.c
net-support.c digcalc.c md5.c filters.c io-internal.c zlib_interface.c
support.c \
+- config.h version.h main.h interface.h netio.h xmlparse.h updatecheck.h
os-support.h conversions.h dialog.h ui-support.h categories.h about.h cookies.h
setup.h net-support.h digcalc.h md5.h filters.h io-internal.h zlib_interface.h
support.h
++ main.c interface.c netio.c xmlparse.c updatecheck.c os-support.c
conversions.c dialog.c ui-support.c categories.c about.c cookies.c setup.c
net-support.c digcalc.c md5.c filters.c io-internal.c zlib_interface.c
support.c etc_path.c\
++ config.h version.h main.h interface.h netio.h xmlparse.h updatecheck.h
os-support.h conversions.h dialog.h ui-support.h categories.h about.h cookies.h
setup.h net-support.h digcalc.h md5.h filters.h io-internal.h zlib_interface.h
support.h etc_path.h
+
+ ### Translations ###
+ LOCALES= de es fr it nl ru sl se zh_TW zh_CN pt_BR pl ja [EMAIL PROTECTED]
uk_UA
+diff -Naur snownews-1.5.10.original/cookies.c snownews-1.5.10/cookies.c
+--- snownews-1.5.10.original/cookies.c 2008-07-28 11:26:16.000000000 +0200
++++ snownews-1.5.10/cookies.c 2008-09-04 11:42:12.000000000 +0200
+@@ -34,6 +34,7 @@
#include "config.h"
#include "ui-support.h"
@@ -9,7 +31,7 @@
void CookieCutter (struct feed * cur_ptr, FILE * cookies) {
char buf[4096]; /* File read buffer. */
-@@ -212,7 +213,7 @@
+@@ -209,7 +210,7 @@
char file[512]; /* File locations. */
FILE *cookies; /* Cookies file ptr. */
@@ -18,10 +40,10 @@
cookies = fopen (file, "r");
if (cookies == NULL) {
/* No cookies to load. */
-diff -u -r -N --from-file=snownews-1.5.7.original/
snownews-1.5.7.original/dialog.c snownews-1.5.7/dialog.c
---- snownews-1.5.7.original/dialog.c 2005-06-05 11:50:22.000000000 +0200
-+++ snownews-1.5.7/dialog.c 2005-09-03 21:46:27.000000000 +0200
-@@ -42,6 +42,7 @@
+diff -Naur snownews-1.5.10.original/dialog.c snownews-1.5.10/dialog.c
+--- snownews-1.5.10.original/dialog.c 2008-07-28 11:26:16.000000000 +0200
++++ snownews-1.5.10/dialog.c 2008-09-04 11:42:12.000000000 +0200
+@@ -39,6 +39,7 @@
#include "dialog.h"
#include "io-internal.h"
#include "conversions.h"
@@ -41,9 +63,9 @@
UISupportDrawBox (5, 4, COLS-6, 13);
-diff -u -r -N --from-file=snownews-1.5.7.original/
snownews-1.5.7.original/etc_path.c snownews-1.5.7/etc_path.c
---- snownews-1.5.7.original/etc_path.c 1970-01-01 01:00:00.000000000 +0100
-+++ snownews-1.5.7/etc_path.c 2005-09-03 21:57:47.000000000 +0200
+diff -Naur snownews-1.5.10.original/etc_path.c snownews-1.5.10/etc_path.c
+--- snownews-1.5.10.original/etc_path.c 1970-01-01 01:00:00.000000000
+0100
++++ snownews-1.5.10/etc_path.c 2008-09-04 11:42:12.000000000 +0200
@@ -0,0 +1,12 @@
+/*
+ * Set path for preferences. <[EMAIL PROTECTED]>
@@ -57,9 +79,9 @@
+ etc_dir = getenv("HOME");
+ return etc_dir;
+ }
-diff -u -r -N --from-file=snownews-1.5.7.original/
snownews-1.5.7.original/etc_path.h snownews-1.5.7/etc_path.h
---- snownews-1.5.7.original/etc_path.h 1970-01-01 01:00:00.000000000 +0100
-+++ snownews-1.5.7/etc_path.h 2005-09-03 21:54:16.000000000 +0200
+diff -Naur snownews-1.5.10.original/etc_path.h snownews-1.5.10/etc_path.h
+--- snownews-1.5.10.original/etc_path.h 1970-01-01 01:00:00.000000000
+0100
++++ snownews-1.5.10/etc_path.h 2008-09-04 11:42:12.000000000 +0200
@@ -0,0 +1,6 @@
+#ifndef ETC_PATH_H
+#define ETC_PATH_H
@@ -67,10 +89,10 @@
+char *set_config_dir (void);
+
+#endif
-diff -u -r -N --from-file=snownews-1.5.7.original/
snownews-1.5.7.original/interface.c snownews-1.5.7/interface.c
---- snownews-1.5.7.original/interface.c 2005-06-05 11:50:22.000000000
+0200
-+++ snownews-1.5.7/interface.c 2005-09-03 22:23:07.000000000 +0200
-@@ -48,6 +48,7 @@
+diff -Naur snownews-1.5.10.original/interface.c snownews-1.5.10/interface.c
+--- snownews-1.5.10.original/interface.c 2008-07-28 11:26:16.000000000
+0200
++++ snownews-1.5.10/interface.c 2008-09-04 11:42:12.000000000 +0200
+@@ -46,6 +46,7 @@
#include "io-internal.h"
#include "os-support.h"
#include "support.h"
@@ -78,7 +100,7 @@
extern struct keybindings keybindings;
extern struct color color;
-@@ -1302,9 +1303,9 @@
+@@ -1323,9 +1324,9 @@
/* Remove cachefile from
filesystem. */
hashme =
Hashify(highlighted->feedurl);
@@ -90,10 +112,10 @@
/* Errors from unlink can be
ignored. Worst thing that happens is that
we delete a file that
doesn't exist. */
-diff -u -r -N --from-file=snownews-1.5.7.original/
snownews-1.5.7.original/io-internal.c snownews-1.5.7/io-internal.c
---- snownews-1.5.7.original/io-internal.c 2005-06-05 11:50:22.000000000
+0200
-+++ snownews-1.5.7/io-internal.c 2005-09-03 21:46:45.000000000 +0200
-@@ -46,6 +46,7 @@
+diff -Naur snownews-1.5.10.original/io-internal.c snownews-1.5.10/io-internal.c
+--- snownews-1.5.10.original/io-internal.c 2008-07-28 11:26:16.000000000
+0200
++++ snownews-1.5.10/io-internal.c 2008-09-04 11:42:12.000000000 +0200
+@@ -43,6 +43,7 @@
#include "xmlparse.h"
#include "ui-support.h"
#include "io-internal.h"
@@ -101,7 +123,7 @@
extern char *browser;
-@@ -279,7 +280,7 @@
+@@ -276,7 +277,7 @@
return 0;
hashme = Hashify(cur_ptr->feedurl);
@@ -110,7 +132,7 @@
free (hashme);
cache = fopen (file, "r");
-@@ -391,7 +392,7 @@
+@@ -388,7 +389,7 @@
UIStatus (_("Saving settings ["), 0, 0);
titlestrlen = strlen (_("Saving settings ["));
@@ -119,7 +141,7 @@
configfile = fopen (file, "w+");
if (configfile == NULL) {
MainQuit (_("Save settings (browser)"), strerror(errno));
-@@ -399,12 +400,12 @@
+@@ -396,12 +397,12 @@
fputs (browser, configfile);
fclose (configfile);
@@ -134,7 +156,7 @@
system (syscall);
}
}
-@@ -463,7 +464,7 @@
+@@ -460,7 +461,7 @@
* Write cache.
*/
hashme = Hashify(cur_ptr->feedurl);
@@ -143,32 +165,10 @@
free (hashme);
cache = fopen (file, "w+");
-diff -u -r -N --from-file=snownews-1.5.7.original/
snownews-1.5.7.original/Makefile snownews-1.5.7/Makefile
---- snownews-1.5.7.original/Makefile 2005-06-05 11:50:22.000000000 +0200
-+++ snownews-1.5.7/Makefile 2005-09-03 21:55:47.000000000 +0200
-@@ -8,15 +8,15 @@
- include platform_settings
-
- ### Object files ###
--OBJFILES= main.o netio.o interface.o xmlparse.o updatecheck.o conversions.o
dialog.o ui-support.o categories.o about.o cookies.o setup.o net-support.o
digcalc.o md5.o filters.o io-internal.o os-support.o zlib_interface.o support.o
-+OBJFILES= main.o netio.o interface.o xmlparse.o updatecheck.o conversions.o
dialog.o ui-support.o categories.o about.o cookies.o setup.o net-support.o
digcalc.o md5.o filters.o io-internal.o os-support.o zlib_interface.o support.o
etc_path.o
-
- VERSION= `grep VERSION version.h | sed s/\"//g | sed s/\#define\ VERSION\ //`
- DISTDIR= snownews-$(VERSION)
- DISTFILES = AUTHOR COPYING CREDITS Changelog README README.de README.patching
INSTALL opml2snow snowsync \
- Makefile platform_settings configure \
- doc po scripts \
-- main.c interface.c netio.c xmlparse.c updatecheck.c os-support.c
conversions.c dialog.c ui-support.c categories.c about.c cookies.c setup.c
net-support.c digcalc.c md5.c filters.c io-internal.c zlib_interface.c
support.c \
-- config.h version.h main.h interface.h netio.h xmlparse.h updatecheck.h
os-support.h conversions.h dialog.h ui-support.h categories.h about.h cookies.h
setup.h net-support.h digcalc.h md5.h filters.h io-internal.h zlib_interface.h
support.h
-+ main.c interface.c netio.c xmlparse.c updatecheck.c os-support.c
conversions.c dialog.c ui-support.c categories.c about.c cookies.c setup.c
net-support.c digcalc.c md5.c filters.c io-internal.c zlib_interface.c
support.c etc_path.c\
-+ config.h version.h main.h interface.h netio.h xmlparse.h updatecheck.h
os-support.h conversions.h dialog.h ui-support.h categories.h about.h cookies.h
setup.h net-support.h digcalc.h md5.h filters.h io-internal.h zlib_interface.h
support.h etc_path.h
-
- ### Translations ###
- LOCALES= de es fr it nl ru sl zh_TW zh_CN pt_BR pl ja
-diff -u -r -N --from-file=snownews-1.5.7.original/
snownews-1.5.7.original/setup.c snownews-1.5.7/setup.c
---- snownews-1.5.7.original/setup.c 2005-06-05 11:50:22.000000000 +0200
-+++ snownews-1.5.7/setup.c 2005-09-03 22:21:52.000000000 +0200
-@@ -43,6 +43,7 @@
+diff -Naur snownews-1.5.10.original/setup.c snownews-1.5.10/setup.c
+--- snownews-1.5.10.original/setup.c 2008-07-28 11:26:16.000000000 +0200
++++ snownews-1.5.10/setup.c 2008-09-04 11:42:12.000000000 +0200
+@@ -40,6 +40,7 @@
#include "main.h"
#include "setup.h"
#include "io-internal.h"
@@ -176,7 +176,7 @@
struct feed *first_ptr = NULL;
struct entity *first_entity = NULL;
-@@ -558,7 +559,7 @@
+@@ -559,7 +560,7 @@
/*
* Setup config directories.
*/
@@ -185,7 +185,7 @@
if ((stat (file, &dirtest)) == -1 ) {
/* Create directory. */
if (mkdir (file, S_IRWXU | S_IRGRP | S_IXGRP | S_IROTH |
S_IXOTH) != 0)
-@@ -571,7 +572,7 @@
+@@ -572,7 +573,7 @@
}
}
@@ -194,7 +194,7 @@
if ((stat (file, &dirtest)) == -1) {
/* Create directory. */
if (mkdir (file, S_IRWXU | S_IRGRP | S_IXGRP | S_IROTH |
S_IXOTH) != 0)
-@@ -585,20 +586,20 @@
+@@ -586,20 +587,20 @@
/* Redirect stderr to ~/.snownews/error.log
Be sure to call _after_ the directory checks above! */
@@ -218,7 +218,7 @@
configfile = fopen (file, "r");
if (configfile == NULL) {
UIStatus (_("Creating new configfile."), 0, 0);
-@@ -693,13 +694,13 @@
+@@ -694,13 +695,13 @@
}
fclose (configfile);
@@ -235,10 +235,10 @@
SetupEntities (file);
return numfeeds;
-diff -u -r -N --from-file=snownews-1.5.7.original/
snownews-1.5.7.original/support.c snownews-1.5.7/support.c
---- snownews-1.5.7.original/support.c 2005-06-05 11:50:22.000000000 +0200
-+++ snownews-1.5.7/support.c 2005-09-03 22:18:04.000000000 +0200
-@@ -31,6 +31,7 @@
+diff -Naur snownews-1.5.10.original/support.c snownews-1.5.10/support.c
+--- snownews-1.5.10.original/support.c 2008-07-28 11:26:16.000000000 +0200
++++ snownews-1.5.10/support.c 2008-09-04 11:42:12.000000000 +0200
+@@ -28,6 +28,7 @@
#include <sys/stat.h>
#include <sys/select.h>
#include <time.h>
@@ -246,7 +246,7 @@
int easterEgg (void) {
struct tm *t;
-@@ -42,7 +43,7 @@
+@@ -39,7 +40,7 @@
tunix = time(0);
t = localtime(&tunix);
@@ -255,10 +255,10 @@
if ((stat (file, &filetest) == 0) ||
((t->tm_mon == 11) && (t->tm_mday >= 24) && (t->tm_mday <=
26))) {
return 1;
-diff -u -r -N --from-file=snownews-1.5.7.original/
snownews-1.5.7.original/ui-support.c snownews-1.5.7/ui-support.c
---- snownews-1.5.7.original/ui-support.c 2005-06-05 11:50:22.000000000
+0200
-+++ snownews-1.5.7/ui-support.c 2005-09-03 22:14:50.000000000 +0200
-@@ -35,6 +35,7 @@
+diff -Naur snownews-1.5.10.original/ui-support.c snownews-1.5.10/ui-support.c
+--- snownews-1.5.10.original/ui-support.c 2008-07-28 11:26:16.000000000
+0200
++++ snownews-1.5.10/ui-support.c 2008-09-04 11:42:12.000000000 +0200
+@@ -32,6 +32,7 @@
#include "version.h"
#include "ui-support.h"
#include "io-internal.h"
@@ -266,7 +266,7 @@
extern struct color color;
extern char *browser;
-@@ -373,7 +374,7 @@
+@@ -392,7 +393,7 @@
else
pager = strdup("less");
@@ -275,10 +275,10 @@
snprintf (errorlog, sizeof(errorlog), "%s/.snownews/error.log", env);
snprintf (command, sizeof(command), "%s %s", pager, errorlog);
-diff -u -r -N --from-file=snownews-1.5.7.original/
snownews-1.5.7.original/updatecheck.c snownews-1.5.7/updatecheck.c
---- snownews-1.5.7.original/updatecheck.c 2005-06-05 11:50:22.000000000
+0200
-+++ snownews-1.5.7/updatecheck.c 2005-09-03 22:16:14.000000000 +0200
-@@ -38,7 +38,7 @@
+diff -Naur snownews-1.5.10.original/updatecheck.c snownews-1.5.10/updatecheck.c
+--- snownews-1.5.10.original/updatecheck.c 2008-07-28 11:26:16.000000000
+0200
++++ snownews-1.5.10/updatecheck.c 2008-09-04 11:42:12.000000000 +0200
+@@ -34,7 +34,7 @@
#include "version.h"
#include "netio.h"
#include "io-internal.h"
@@ -287,7 +287,7 @@
void AutoVersionCheck (void) {
struct feed *update;
-@@ -55,7 +55,7 @@
+@@ -51,7 +51,7 @@
/* We check once a week. */
snprintf (timestring, sizeof(timestring), "%d", (int) time(NULL));
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/snownews-home_etc.patch?r1=1.1&r2=1.2&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
