giovanni
parent
340a880387
commit
a0253c4608
|
|
@ -1,8 +1,8 @@
|
|||
COMMENT= threaded NNTP- and spool-based UseNet newsreader
|
||||
|
||||
DISTNAME= tin-${MAJORVERSION}.${PATCHLEVEL}
|
||||
MAJORVERSION= 2.4
|
||||
PATCHLEVEL= 4
|
||||
MAJORVERSION= 2.6
|
||||
PATCHLEVEL= 2
|
||||
CATEGORIES= news
|
||||
|
||||
MASTER_SITES= ftp://ftp.tin.org/pub/news/clients/tin/stable/ \
|
||||
|
|
@ -15,8 +15,6 @@ MASTER_SITES= ftp://ftp.tin.org/pub/news/clients/tin/stable/ \
|
|||
|
||||
HOMEPAGE= http://www.tin.org/
|
||||
|
||||
MAINTAINER= Giovanni Bechis <giovanni@openbsd.org>
|
||||
|
||||
# This software cannot be redistributed freely due to a few files having
|
||||
# licenses that prohibit making money from redistribution - see src/nntplib.c,
|
||||
# vms/vms.c
|
||||
|
|
|
|||
|
|
@ -1,2 +1,2 @@
|
|||
SHA256 (tin-2.4.4.tar.gz) = K1E6q8C5T36S7KF14+0aVQAwdpwHuyNtHakD/tnORDE=
|
||||
SIZE (tin-2.4.4.tar.gz) = 3218544
|
||||
SHA256 (tin-2.6.2.tar.gz) = gbjAftYOLJfTZ314wh8yD4yXuEFzuaegAf7XQqqtHHA=
|
||||
SIZE (tin-2.6.2.tar.gz) = 3378536
|
||||
|
|
|
|||
|
|
@ -1,30 +1,34 @@
|
|||
Index: configure.in
|
||||
--- configure.in.orig
|
||||
+++ configure.in
|
||||
@@ -900,13 +900,15 @@ fi
|
||||
@@ -980,16 +980,19 @@ if test $ac_cv_nl_item = yes; then
|
||||
AC_DEFINE(HAVE_NL_ITEM,1,[Define this to 1 if we have header nl_types.h])
|
||||
fi
|
||||
|
||||
+
|
||||
+ # ICU - International Components for Unicode
|
||||
### Checks for libraries.
|
||||
# libuu/uudeview
|
||||
# only define HAVE_LIBUU and HAVE_UUDEVIEW_H if both are found
|
||||
-AC_CHECK_LIB(uu, UUInitialize,
|
||||
- [AC_CHECK_HEADER(uudeview.h,
|
||||
- [AC_DEFINE(HAVE_LIBUU)
|
||||
- AC_DEFINE(HAVE_UUDEVIEW_H)
|
||||
- [AC_DEFINE(HAVE_LIBUU,1,[Define this to 1 if we have library uu])
|
||||
- AC_DEFINE(HAVE_UUDEVIEW_H,1,[Define this to 1 if we have header uudeview.h])
|
||||
- LIBS="$LIBS -luu"]
|
||||
- )]
|
||||
-)
|
||||
+dnl Disable to make sure the package does not change if someone ever ports this
|
||||
+dnl
|
||||
+dnl AC_CHECK_LIB(uu, UUInitialize,
|
||||
+dnl [AC_CHECK_HEADER(uudeview.h,
|
||||
+dnl [AC_DEFINE(HAVE_LIBUU)
|
||||
+dnl AC_DEFINE(HAVE_UUDEVIEW_H)
|
||||
+dnl LIBS="$LIBS -luu"]
|
||||
+dnl )]
|
||||
+dnl [AC_CHECK_HEADER(uudeview.h,
|
||||
+dnl [AC_DEFINE(HAVE_LIBUU,1,[Define this to 1 if we have library uu])
|
||||
+dnl AC_DEFINE(HAVE_UUDEVIEW_H,1,[Define this to 1 if we have header uudeview.h])
|
||||
+dnl LIBS="$LIBS -luu"]
|
||||
+dnl )]
|
||||
+dnl )
|
||||
|
||||
|
||||
# ICU - International Components for Unicode
|
||||
@@ -1235,7 +1237,11 @@ CF_TERMIOS
|
||||
@@ -1323,7 +1326,11 @@ CF_TERMIOS
|
||||
CF_PW_GECOS
|
||||
CF_TM_GMTOFF
|
||||
|
||||
|
|
|
|||
|
|
@ -1,15 +1,15 @@
|
|||
Index: src/Makefile.in
|
||||
--- src/Makefile.in.orig
|
||||
+++ src/Makefile.in
|
||||
@@ -81,6 +81,7 @@ LINK_LIBS = $(PCRE_LIBS) $(CANLIB) @LIBS@ $(INTL_LIBS)
|
||||
@@ -83,6 +83,7 @@ LINK_LIBS = $(PCRE_LIBS) $(CANLIB) @LIBS@ $(INTL_LIBS)
|
||||
# Where do you want the binary & manual page installed?
|
||||
DESTDIR = @DESTDIR@
|
||||
DESTDIR = @DESTDIR@
|
||||
INS_BINARY_DIR = @bindir@
|
||||
+INS_DATA_DIR = @datadir@/tin
|
||||
INS_MANUAL_DIR = @mandir@/man
|
||||
INS_SYSDEF_DIR = @TIN_DEFAULTS_DIR@
|
||||
INS_MANUAL_EXT = 1
|
||||
@@ -332,6 +333,7 @@ help :
|
||||
@@ -340,6 +341,7 @@ help :
|
||||
$(DESTDIR)$(INS_MANUAL_DIR)$(INS_MANUAL_EXT) \
|
||||
$(DESTDIR)$(INS_MANUAL_DIR)5 \
|
||||
$(DESTDIR)$(INS_BINARY_DIR) \
|
||||
|
|
@ -17,7 +17,7 @@ Index: src/Makefile.in
|
|||
$(DESTDIR)$(INS_SYSDEF_DIR) :
|
||||
mkdir -p $@
|
||||
|
||||
@@ -340,11 +342,6 @@ install_manpage : $(DESTDIR)$(INS_MANUAL_DIR)$(INS_MAN
|
||||
@@ -348,11 +350,6 @@ install_manpage : $(DESTDIR)$(INS_MANUAL_DIR)$(INS_MAN
|
||||
@$(INSTALL) -m 444 $(DOCDIR)/tin.1 $(DESTDIR)$(INS_MANUAL_DIR)$(INS_MANUAL_EXT)/$(PROJECT).$(INS_MANUAL_EXT)
|
||||
@( $(CD) $(DESTDIR)$(INS_MANUAL_DIR)$(INS_MANUAL_EXT) && $(RM) -f r$(PROJECT).$(INS_MANUAL_EXT) && $(LN) $(PROJECT).$(INS_MANUAL_EXT) r$(PROJECT).$(INS_MANUAL_EXT) )
|
||||
@$(INSTALL) -m 444 $(DOCDIR)/tin.5 $(DESTDIR)$(INS_MANUAL_DIR)5/$(PROJECT).5
|
||||
|
|
@ -29,7 +29,7 @@ Index: src/Makefile.in
|
|||
|
||||
uninstall_manpage :
|
||||
@$(ECHO) "Uninstalling $(PROJECT) manual page in $(DESTDIR)$(INS_MANUAL_DIR)$(INS_MANUAL_EXT) ..."
|
||||
@@ -382,13 +379,13 @@ uninstall_sysdefs :
|
||||
@@ -390,13 +387,13 @@ uninstall_sysdefs :
|
||||
@-$(RM) -f $(DESTDIR)$(INS_SYSDEF_DIR)/tin.defaults
|
||||
@-$(RM) -f $(DESTDIR)$(INS_SYSDEF_DIR)/mime.types
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
Index: src/misc.c
|
||||
--- src/misc.c.orig
|
||||
+++ src/misc.c
|
||||
@@ -2158,8 +2158,6 @@ random_organization(
|
||||
@@ -2195,8 +2195,6 @@ random_organization(
|
||||
if (*in_org != '/')
|
||||
return in_org;
|
||||
|
||||
|
|
@ -10,7 +10,7 @@ Index: src/misc.c
|
|||
if ((orgfp = fopen(in_org, "r")) == NULL)
|
||||
return selorg;
|
||||
|
||||
@@ -2173,7 +2171,7 @@ random_organization(
|
||||
@@ -2210,7 +2208,7 @@ random_organization(
|
||||
}
|
||||
|
||||
rewind(orgfp);
|
||||
|
|
|
|||
|
|
@ -1,14 +1,15 @@
|
|||
--- src/parsdate.y.orig Fri Apr 19 21:23:02 2013
|
||||
+++ src/parsdate.y Fri Apr 19 21:59:31 2013
|
||||
@@ -519,6 +519,7 @@ Convert(
|
||||
Index: src/parsdate.y
|
||||
--- src/parsdate.y.orig
|
||||
+++ src/parsdate.y
|
||||
@@ -524,6 +524,7 @@ Convert(
|
||||
static const int DaysLeap[13] = {
|
||||
0, 31, 29, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31
|
||||
};
|
||||
+/* XXX 2038 */
|
||||
static const int LeapYears[] = {
|
||||
1972, 1976, 1980, 1984, 1988, 1992, 1996,
|
||||
2000, 2004, 2008, 2012, 2016, 2020, 2024, 2028, 2032, 2036
|
||||
@@ -542,7 +543,9 @@ Convert(
|
||||
2000, 2004, 2008, 2012, 2016, 2020, 2024,
|
||||
@@ -549,7 +550,9 @@ Convert(
|
||||
mp = DaysLeap;
|
||||
break;
|
||||
}
|
||||
|
|
@ -18,4 +19,4 @@
|
|||
+ || (sizeof(time_t) == sizeof(int) && Year > 2038)
|
||||
|| Month < 1 || Month > 12
|
||||
/* NOSTRICT */ /* conversion from long may lose accuracy */
|
||||
|| Day < 1 || Day > mp[(int)Month])
|
||||
|| Day < 1 || Day > mp[Month])
|
||||
|
|
|
|||
|
|
@ -1,13 +1,13 @@
|
|||
Index: src/rfc2047.c
|
||||
--- src/rfc2047.c.orig
|
||||
+++ src/rfc2047.c
|
||||
@@ -1066,9 +1066,8 @@ generate_random_mime_boundary(
|
||||
@@ -1073,9 +1073,8 @@ generate_random_mime_boundary(
|
||||
{
|
||||
size_t i;
|
||||
|
||||
- srand((unsigned int) time(NULL));
|
||||
for (i = 0; i < len - 1; i++)
|
||||
- boundary[i] = base64_alphabet[rand() % sizeof(base64_alphabet)];
|
||||
- boundary[i] = base64_alphabet[(size_t) rand() % sizeof(base64_alphabet)];
|
||||
+ boundary[i] = base64_alphabet[arc4random_uniform(sizeof(base64_alphabet))];
|
||||
boundary[len - 1] = '\0';
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
Index: src/sigfile.c
|
||||
--- src/sigfile.c.orig
|
||||
+++ src/sigfile.c
|
||||
@@ -197,8 +197,6 @@ static FILE *
|
||||
@@ -203,8 +203,6 @@ static FILE *
|
||||
open_random_sig(
|
||||
char *sigdir)
|
||||
{
|
||||
|
|
@ -10,7 +10,7 @@ Index: src/sigfile.c
|
|||
if (chdir(sigdir) == 0) {
|
||||
if (thrashdir(sigdir) || !*sigfile) {
|
||||
#ifdef DEBUG
|
||||
@@ -271,7 +269,7 @@ thrashdir(
|
||||
@@ -277,7 +275,7 @@ thrashdir(
|
||||
return 1;
|
||||
}
|
||||
#endif /* HAVE_REWINDDIR */
|
||||
|
|
|
|||
Loading…
Reference in New Issue