瀏覽代碼

allow '-' in user/group names for Net::Server

Michael van Elst 22 年之前
父節點
當前提交
441eacaad0
共有 2 個文件被更改,包括 24 次插入2 次删除
  1. 20 0
      perl-net/perl-net.patch
  2. 4 2
      perl-net/perl-net.spec

+ 20 - 0
perl-net/perl-net.patch

@@ -0,0 +1,20 @@
+--- Net-Server-0.85/lib/Net/Server.pm.dist	Tue Apr 22 14:38:13 2003
++++ Net-Server-0.85/lib/Net/Server.pm	Tue Apr 22 14:39:16 2003
+@@ -402,7 +402,7 @@
+     $self->log(1,"Group Not Defined.  Defaulting to EGID '$)'\n");
+     $prop->{group}  = $);
+   }else{
+-    if( $prop->{group} =~ /^(\w+( \w+)*)$/ ){
++    if( $prop->{group} =~ /^([\w\-]+( [\w\-]+)*)$/ ){
+       $prop->{group} = eval{ get_gid( $1 ) };
+       $self->fatal( $@ ) if $@;
+     }else{
+@@ -416,7 +416,7 @@
+     $self->log(1,"User Not Defined.  Defaulting to EUID '$>'\n");
+     $prop->{user}  = $>;
+   }else{
+-    if( $prop->{user} =~ /^(\w+)$/ ){
++    if( $prop->{user} =~ /^([\w\-]+)$/ ){
+       $prop->{user} = eval{ get_uid( $1 ) };
+       $self->fatal( $@ ) if $@;
+     }else{

+ 4 - 2
perl-net/perl-net.spec

@@ -48,8 +48,8 @@ Packager:     The OpenPKG Project
 Distribution: OpenPKG [BASE]
 Group:        Language
 License:      GPL/Artistic
-Version:      20030404
-Release:      20030404
+Version:      20030422
+Release:      20030422
 
 #   package options
 %option       with_curl   no
@@ -69,6 +69,7 @@ Source10:     http://www.cpan.org/modules/by-module/Net/Net-Telnet-Cisco-%{V_net
 Source11:     http://www.cpan.org/modules/by-module/RPC/PlRPC-%{V_plrpc}.tar.gz
 Source12:     http://curl.haxx.se/libcurl/perl/Curl-easy-%{V_curl_easy}.tar.gz
 Source13:     http://www.cpan.org/modules/by-module/Net/Net-IMAP-Simple-%{V_net_imap_simple}.tar.gz
+Patch0:       perl-net.patch
 
 #   build information
 Prefix:       %{l_prefix}
@@ -127,6 +128,7 @@ AutoReqProv:  no
     %setup11 -q -T -D -a 11
     %setup12 -q -T -D -a 12
     %setup13 -q -T -D -a 13
+    %patch0 -p0
 
 %build