Import of pkgsrc-2014Q1
This commit is contained in:
@@ -1,8 +1,8 @@
|
||||
# $NetBSD: Makefile,v 1.7 2013/04/24 10:06:50 sbd Exp $
|
||||
# $NetBSD: Makefile,v 1.10 2014/03/26 14:27:22 taca Exp $
|
||||
#
|
||||
|
||||
DISTNAME= quickml-0.7
|
||||
PKGREVISION= 2
|
||||
PKGREVISION= 4
|
||||
CATEGORIES= mail
|
||||
MASTER_SITES= http://0xcc.net/quickml/
|
||||
|
||||
@@ -15,7 +15,7 @@ GNU_CONFIGURE= yes
|
||||
USE_LANGUAGES= # none
|
||||
RCD_SCRIPTS+= quickml
|
||||
|
||||
RUBY_VERSION_SUPPORTED= 193
|
||||
RUBY_VERSION_SUPPORTED= 200 193 21
|
||||
|
||||
QUICKML_USER= quickml
|
||||
QUICKML_GROUP= quickml
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
@comment $NetBSD: PLIST,v 1.1.1.1 2011/06/19 10:01:53 obache Exp $
|
||||
@comment $NetBSD: PLIST,v 1.2 2014/03/11 14:05:05 jperkin Exp $
|
||||
${PLIST.analog}bin/quickml-analog
|
||||
${RUBY_VENDORLIB}/quickml.rb
|
||||
${RUBY_VENDORLIB}/quickml/config.rb
|
||||
@@ -13,5 +13,4 @@ ${RUBY_VENDORLIB}/quickml/version.rb
|
||||
sbin/quickml
|
||||
sbin/quickml-ctl
|
||||
share/examples/quickml/quickmlrc.sample
|
||||
share/examples/rc.d/quickml
|
||||
share/quickml/messages.ja
|
||||
|
||||
@@ -1,13 +1,14 @@
|
||||
$NetBSD: distinfo,v 1.2 2012/08/11 13:51:20 obache Exp $
|
||||
$NetBSD: distinfo,v 1.3 2013/09/26 09:42:23 obache Exp $
|
||||
|
||||
SHA1 (quickml-0.7.tar.gz) = 7122a100840d16762e101e62993752401e95e5bb
|
||||
RMD160 (quickml-0.7.tar.gz) = bc34b93676eb342a450bc1a2d3b92d7a06603872
|
||||
Size (quickml-0.7.tar.gz) = 94147 bytes
|
||||
SHA1 (patch-Makefile.in) = d1c73befff63dac3f76dad27d70460527f2a1e2a
|
||||
SHA1 (patch-lib_quickml_config.rb) = f47e92e2cd2c89c2d400cca8813c5a82466cec18
|
||||
SHA1 (patch-lib_quickml_core.rb) = 21cb461fb98ca369934e05941be009ca82bcd73b
|
||||
SHA1 (patch-lib_quickml_gettext.rb) = 47f693fb71830781e28dac0e318da03c0caf684b
|
||||
SHA1 (patch-lib_quickml_mail.rb) = b80ea8007b73a7e2b736a08392f5e2153356c6b3
|
||||
SHA1 (patch-lib_quickml_core.rb) = 87226db72c7196bcfa1a7ec5480e52d2e793e45f
|
||||
SHA1 (patch-lib_quickml_gettext.rb) = 7bcb17866ce70a722d0e8107a0825e0e576dbf8d
|
||||
SHA1 (patch-lib_quickml_mail.rb) = 75a71941d3480f5c6a95889eccf006296851f877
|
||||
SHA1 (patch-lib_quickml_server.rb) = b1f540071cd1d89488c03151704abb418201eea4
|
||||
SHA1 (patch-lib_quickml_utils.rb) = 1cb00ffacb3045504b1af59113a5a93327b0bad7
|
||||
SHA1 (patch-messages.ja) = bf82d499b0498844fcdd1371e240870d5c1a17f0
|
||||
SHA1 (patch-quickml-analog.in) = 834d549051bad5495cac7677eb56f4c0c0f38f2e
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
$NetBSD: patch-lib_quickml_core.rb,v 1.1 2012/08/11 13:51:20 obache Exp $
|
||||
$NetBSD: patch-lib_quickml_core.rb,v 1.2 2013/09/26 09:42:23 obache Exp $
|
||||
|
||||
* specify character coding system with ruby-1.9 way
|
||||
* use fileutils instead of deprecated ftools
|
||||
|
||||
--- lib/quickml/core.rb.orig 2004-06-08 20:15:11.000000000 +0000
|
||||
+++ lib/quickml/core.rb
|
||||
@@ -17,3 +18,44 @@ $NetBSD: patch-lib_quickml_core.rb,v 1.1 2012/08/11 13:51:20 obache Exp $
|
||||
require 'quickml/utils'
|
||||
require 'quickml/gettext'
|
||||
|
||||
@@ -318,7 +318,7 @@ module QuickML
|
||||
end
|
||||
|
||||
def remove_alertedp_file
|
||||
- File.safe_unlink(@alertedp_file)
|
||||
+ FileUtils.safe_unlink(@alertedp_file)
|
||||
end
|
||||
|
||||
def _submit (mail)
|
||||
@@ -545,13 +545,13 @@ module QuickML
|
||||
end
|
||||
|
||||
def close
|
||||
- File.safe_unlink(@members_file)
|
||||
- File.safe_unlink(@count_file)
|
||||
- File.safe_unlink(@charset_file)
|
||||
- File.safe_unlink(@alertedp_file)
|
||||
- File.safe_unlink(@waiting_members_file)
|
||||
- File.safe_unlink(@waiting_message_file)
|
||||
- File.safe_unlink(@ml_config_file)
|
||||
+ FileUtils.safe_unlink(@members_file)
|
||||
+ FileUtils.safe_unlink(@count_file)
|
||||
+ FileUtils.safe_unlink(@charset_file)
|
||||
+ FileUtils.safe_unlink(@alertedp_file)
|
||||
+ FileUtils.safe_unlink(@waiting_members_file)
|
||||
+ FileUtils.safe_unlink(@waiting_message_file)
|
||||
+ FileUtils.safe_unlink(@ml_config_file)
|
||||
@logger.log "[#{@name}]: ML Closed"
|
||||
end
|
||||
|
||||
@@ -610,8 +610,8 @@ module QuickML
|
||||
end
|
||||
}
|
||||
submit(mail)
|
||||
- File.safe_unlink(@waiting_members_file)
|
||||
- File.safe_unlink(@waiting_message_file)
|
||||
+ FileUtils.safe_unlink(@waiting_members_file)
|
||||
+ FileUtils.safe_unlink(@waiting_message_file)
|
||||
@logger.log "[#{@name}]: Accept confirmation: #{@addressconfirmation_address} #{@address}"
|
||||
end
|
||||
|
||||
|
||||
@@ -1,6 +1,8 @@
|
||||
$NetBSD: patch-lib_quickml_gettext.rb,v 1.1 2012/08/11 13:51:20 obache Exp $
|
||||
$NetBSD: patch-lib_quickml_gettext.rb,v 1.2 2013/09/26 09:42:23 obache Exp $
|
||||
|
||||
* specify character coding system with ruby-1.9 way
|
||||
* for the case if the encoding of the code of quickml and encoding specified
|
||||
in messages are different
|
||||
|
||||
--- lib/quickml/gettext.rb.orig 2004-06-07 08:50:59.000000000 +0000
|
||||
+++ lib/quickml/gettext.rb
|
||||
@@ -9,3 +11,21 @@ $NetBSD: patch-lib_quickml_gettext.rb,v 1.1 2012/08/11 13:51:20 obache Exp $
|
||||
#
|
||||
# quickml/gettext - a part of quickml server
|
||||
#
|
||||
@@ -22,14 +23,14 @@ module QuickML
|
||||
|
||||
def gettext (text, *args)
|
||||
unless @catalog && @catalog.charset == @message_charset
|
||||
- return sprintf(text, *args)
|
||||
+ return sprintf(text, *args).force_encoding("ASCII-8BIT")
|
||||
end
|
||||
|
||||
translated_message = @catalog.messages[text]
|
||||
if translated_message
|
||||
- codeconv(sprintf(translated_message, *args))
|
||||
+ codeconv(sprintf(translated_message, *args)).force_encoding("ASCII-8BIT")
|
||||
else
|
||||
- sprintf(text, *args)
|
||||
+ sprintf(text, *args).force_encoding("ASCII-8BIT")
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
$NetBSD: patch-lib_quickml_mail.rb,v 1.1 2012/08/11 13:51:20 obache Exp $
|
||||
$NetBSD: patch-lib_quickml_mail.rb,v 1.2 2013/09/26 09:42:23 obache Exp $
|
||||
|
||||
* specify character coding system with ruby-1.9 way
|
||||
* to_a has been removed from the String
|
||||
|
||||
--- lib/quickml/mail.rb.orig 2004-06-07 08:50:59.000000000 +0000
|
||||
+++ lib/quickml/mail.rb
|
||||
@@ -9,3 +10,12 @@ $NetBSD: patch-lib_quickml_mail.rb,v 1.1 2012/08/11 13:51:20 obache Exp $
|
||||
#
|
||||
# quickml/mail - a part of quickml server
|
||||
#
|
||||
@@ -284,7 +285,7 @@ module QuickML
|
||||
def encode_field (field)
|
||||
field.toeuc.gsub(/[¡¡-ô¤]\S*\s*/) {|x|
|
||||
x.scan(/.{1,10}/).map {|y|
|
||||
- "=?iso-2022-jp?B?" + y.tojis.to_a.pack('m').chomp + "?="
|
||||
+ "=?iso-2022-jp?B?" + [y.tojis].pack('m').chomp + "?="
|
||||
}.join("\n ")
|
||||
}
|
||||
end
|
||||
|
||||
15
mail/quickml/patches/patch-lib_quickml_server.rb
Normal file
15
mail/quickml/patches/patch-lib_quickml_server.rb
Normal file
@@ -0,0 +1,15 @@
|
||||
$NetBSD: patch-lib_quickml_server.rb,v 1.1 2013/09/26 09:42:23 obache Exp $
|
||||
|
||||
* use fileutils instead of deprecated ftools
|
||||
|
||||
--- lib/quickml/server.rb.orig 2004-06-07 08:50:59.000000000 +0000
|
||||
+++ lib/quickml/server.rb
|
||||
@@ -335,7 +335,7 @@ module QuickML
|
||||
end
|
||||
|
||||
def remove_pid_file
|
||||
- File.safe_unlink(@config.pid_file) if Process.pid == read_pid_file
|
||||
+ FileUtils.safe_unlink(@config.pid_file) if Process.pid == read_pid_file
|
||||
end
|
||||
|
||||
public
|
||||
Reference in New Issue
Block a user