diff options
| author | Richard A Nelson (Rick) <cowboy@debian.org> | 2006-08-29 14:00:00 +0000 |
|---|---|---|
| committer | Andreas Beckmann <debian@abeckmann.de> | 2012-10-01 19:59:00 +0200 |
| commit | d53dd2fa51cc53321dd4b46791030cc82d741d8b (patch) | |
| tree | 238f27575cd11e7f59b906cc196409fc84959314 /debian/patches/8.13/8.13.7/qtool.patch | |
| parent | 1f66a02f6cb7b203542e2c870a3f61609f34ce57 (diff) | |
| download | sendmail-debian/8.13.8-1.tar.gz | |
Imported Debian patch 8.13.8-1debian/8.13.8-1
Diffstat (limited to 'debian/patches/8.13/8.13.7/qtool.patch')
| -rw-r--r-- | debian/patches/8.13/8.13.7/qtool.patch | 101 |
1 files changed, 0 insertions, 101 deletions
diff --git a/debian/patches/8.13/8.13.7/qtool.patch b/debian/patches/8.13/8.13.7/qtool.patch deleted file mode 100644 index dc288b2..0000000 --- a/debian/patches/8.13/8.13.7/qtool.patch +++ /dev/null @@ -1,101 +0,0 @@ -*** ./sendmail-8.13.7/contrib/qtool.pl Wed Mar 5 16:11:54 2003 ---- ./sendmail-8.13.7/contrib/qtool.pl Wed Mar 5 15:59:10 2003 -*************** -*** 355,373 **** - sub lock_file - { - my $file_name = shift; - my $result; - - $result = sysopen(FILE_TO_LOCK, $file_name, Fcntl::O_RDWR); - if (!$result) - { - return (undef, "Unable to open '$file_name': $!"); - } - -! $result = flock(FILE_TO_LOCK, Fcntl::LOCK_EX | Fcntl::LOCK_NB); -! if (!$result) - { - return (undef, "Could not obtain lock on '$file_name': $!"); - } - - return (\*FILE_TO_LOCK, undef); - } ---- 355,394 ---- - sub lock_file - { - my $file_name = shift; - my $result; - -+ my $FLOCK_STRUCT; -+ my $fcntllock; -+ -+ # Supposedly under linux -+ # my $FLOCK_STRUCT = 's s l l i'; -+ # But I think perl's using __off64_t instead of __off_t -+ # my $FLOCK_STRUCT = 's s l l l l i'; -+ # Screw it, its all zero anyway... -+ -+ $FLOCK_STRUCT = 's H60'; -+ $fcntllock = pack($FLOCK_STRUCT, F_WRLCK, -+ "000000000000000000000000000000000000000000000000000000000000"); -+ - $result = sysopen(FILE_TO_LOCK, $file_name, Fcntl::O_RDWR); - if (!$result) - { -+ # print "Unable to open '$file_name': $!"; - return (undef, "Unable to open '$file_name': $!"); - } - -! $result = fcntl (FILE_TO_LOCK, F_SETLK, $fcntllock); -! -! # print "Fcntl Lock result on $file_name = $result\n"; -! -! # $result = flock(FILE_TO_LOCK, Fcntl::LOCK_EX | Fcntl::LOCK_NB); -! # print "Lock result on $file_name = $result\n"; -! # if (!$result) -! if ($result ne "0 but true") - { -+ # print "Could not obtain lock on '$file_name': $!\n"; - return (undef, "Could not obtain lock on '$file_name': $!"); - } - - return (\*FILE_TO_LOCK, undef); - } -*************** -*** 387,399 **** - - sub unlock_file - { - my $file = shift; - my $result; - -! $result = flock($file, Fcntl::LOCK_UN); -! if (!$result) - { - return "Unlock failed on '$result': $!"; - } - - return undef; ---- 408,428 ---- - - sub unlock_file - { - my $file = shift; - my $result; -+ my $FLOCK_STRUCT; -+ my $fcntllock; - -! $FLOCK_STRUCT = 's H60'; -! $fcntllock = pack($FLOCK_STRUCT, F_UNLCK, -! "000000000000000000000000000000000000000000000000000000000000"); -! $result = fcntl (FILE_TO_LOCK, F_SETLK, $fcntllock); -! -! if ($result ne "0 but true") -! # $result = flock($file, Fcntl::LOCK_UN); -! # if (!$result) - { - return "Unlock failed on '$result': $!"; - } - - return undef; |